nitc: update code to use qclassids

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

diff --git a/src/frontend/i18n_phase.nit b/src/frontend/i18n_phase.nit
index 32fa326..0550caf 100644 (file)
--- a/src/frontend/i18n_phase.nit
+++ b/src/frontend/i18n_phase.nit
@@ -58,7 +58,7 @@ private class I18NPhase
 
                var pot_path = locale_dir / module_name
                var arr = vi.strings.values.to_a
 
                var pot_path = locale_dir / module_name
                var arr = vi.strings.values.to_a

-               var po = new POFile.with_strings(arr)
+               var po = new POFile(arr)

                po.write_template(pot_path)
 
                if lang != null then
                po.write_template(pot_path)
 
                if lang != null then

@@ -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

@@ -189,12 +191,6 @@ class POFile
        # Read from a PO file
        var strings: Array[PObject]
 
        # Read from a PO file
        var strings: Array[PObject]
 

-       # Creates a PO file with strings built-in
-       init with_strings(sm: Array[PObject])do
-               strings = new Array[PObject].with_capacity(sm.length)
-               strings.add_all sm
-       end
-

        redef fun write_to_file(path) do
                if not path.has_suffix(".po") then path += ".po"
                super path
        redef fun write_to_file(path) do
                if not path.has_suffix(".po") then path += ".po"
                super path