src: move pseudo-toplevel methods from Object

[nit.git] / src / frontend / i18n_phase.nit

diff --git a/src/frontend/i18n_phase.nit b/src/frontend/i18n_phase.nit
index 32fa326..fac760c 100644 (file)
--- a/src/frontend/i18n_phase.nit
+++ b/src/frontend/i18n_phase.nit
@@ -130,8 +130,9 @@ end
 redef class AStringExpr
 
        redef fun accept_string_finder(v) do
 redef class AStringExpr
 
        redef fun accept_string_finder(v) do

-               var parse = v.toolcontext.parse_expr("\"{str}\".get_translation(\"{v.domain}\", \"{v.languages_location}\").unescape_nit")

                var str = value.as(not null).escape_to_gettext
                var str = value.as(not null).escape_to_gettext

+               var code = "\"{str}\".get_translation(\"{v.domain}\", \"{v.languages_location}\")"
+               var parse = v.toolcontext.parse_expr(code)

                replace_with(parse)
                v.add_string(str, location)
        end
                replace_with(parse)
                v.add_string(str, location)
        end

@@ -154,7 +155,8 @@ redef class ASuperstringExpr
                end
                fmt = fmt.escape_to_gettext
                v.add_string(fmt, location)
                end
                fmt = fmt.escape_to_gettext
                v.add_string(fmt, location)

-               var parse = v.toolcontext.parse_expr("\"{fmt}\".get_translation(\"{v.domain}\", \"{v.languages_location}\").unescape_nit.format()")
+               var code = "\"{fmt}\".get_translation(\"{v.domain}\", \"{v.languages_location}\").format()"
+               var parse = v.toolcontext.parse_expr(code)

                if not parse isa ACallExpr then
                        v.toolcontext.error(location, "Fatal error in i18n annotation, the parsed superstring could not be generated properly")
                        return
                if not parse isa ACallExpr then
                        v.toolcontext.error(location, "Fatal error in i18n annotation, the parsed superstring could not be generated properly")
                        return