Merge: doc: fixed some typos and other misc. corrections

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

diff --git a/src/frontend/i18n_phase.nit b/src/frontend/i18n_phase.nit
index 0550caf..14bf436 100644 (file)
--- a/src/frontend/i18n_phase.nit
+++ b/src/frontend/i18n_phase.nit
@@ -130,7 +130,7 @@ end
 redef class AStringExpr
 
        redef fun accept_string_finder(v) do
-               var str = value.as(not null).escape_to_gettext
+               var str = value.escape_to_gettext
                var code = "\"{str}\".get_translation(\"{v.domain}\", \"{v.languages_location}\")"
                var parse = v.toolcontext.parse_expr(code)
                replace_with(parse)
@@ -146,11 +146,12 @@ redef class ASuperstringExpr
                for i in n_exprs do
                        if i isa AStartStringExpr or i isa AEndStringExpr or i isa AMidStringExpr then
                                assert i isa AStringFormExpr
-                               fmt += i.value.as(not null)
+                               var str = i.value
+                               fmt += str.replace("%", "%%")
                        else
                                fmt += "%"
                                exprs.push i
-                               fmt += exprs.length.to_s
+                               fmt += (exprs.length-1).to_s
                        end
                end
                fmt = fmt.escape_to_gettext