Merge pull request #6329 from maribethb/msg-again

fix: Make message files work in unpackaged mode, and rebuild msg files
google · Aug 9, 2022 · 463acb3 · 463acb3
2 parents c8dd01a + 4b1bb8c
commit 463acb3
Show file tree

Hide file tree

Showing 124 changed files with 51,123 additions and 51,123 deletions.
diff --git a/msg/js/ab.js b/msg/js/ab.js
diff --git a/msg/js/ace.js b/msg/js/ace.js
diff --git a/msg/js/af.js b/msg/js/af.js
diff --git a/msg/js/am.js b/msg/js/am.js
diff --git a/msg/js/ar.js b/msg/js/ar.js
diff --git a/msg/js/ast.js b/msg/js/ast.js
diff --git a/msg/js/az.js b/msg/js/az.js
diff --git a/msg/js/ba.js b/msg/js/ba.js
diff --git a/msg/js/bcc.js b/msg/js/bcc.js
diff --git a/msg/js/be-tarask.js b/msg/js/be-tarask.js
diff --git a/msg/js/be.js b/msg/js/be.js
diff --git a/msg/js/bg.js b/msg/js/bg.js
diff --git a/msg/js/bn.js b/msg/js/bn.js
diff --git a/msg/js/br.js b/msg/js/br.js
diff --git a/msg/js/bs.js b/msg/js/bs.js
diff --git a/msg/js/ca.js b/msg/js/ca.js
diff --git a/msg/js/cdo.js b/msg/js/cdo.js
diff --git a/msg/js/cs.js b/msg/js/cs.js
diff --git a/msg/js/da.js b/msg/js/da.js
diff --git a/msg/js/de.js b/msg/js/de.js
diff --git a/msg/js/diq.js b/msg/js/diq.js
diff --git a/msg/js/dty.js b/msg/js/dty.js
diff --git a/msg/js/ee.js b/msg/js/ee.js
diff --git a/msg/js/el.js b/msg/js/el.js
diff --git a/msg/js/en-gb.js b/msg/js/en-gb.js
diff --git a/msg/js/en.js b/msg/js/en.js
diff --git a/msg/js/eo.js b/msg/js/eo.js
diff --git a/msg/js/es.js b/msg/js/es.js
diff --git a/msg/js/et.js b/msg/js/et.js
diff --git a/msg/js/eu.js b/msg/js/eu.js
diff --git a/msg/js/fa.js b/msg/js/fa.js
diff --git a/msg/js/fi.js b/msg/js/fi.js
diff --git a/msg/js/fo.js b/msg/js/fo.js
diff --git a/msg/js/fr.js b/msg/js/fr.js
diff --git a/msg/js/frr.js b/msg/js/frr.js
diff --git a/msg/js/gl.js b/msg/js/gl.js
diff --git a/msg/js/gn.js b/msg/js/gn.js
diff --git a/msg/js/gor.js b/msg/js/gor.js
diff --git a/msg/js/ha.js b/msg/js/ha.js
diff --git a/msg/js/hak.js b/msg/js/hak.js
diff --git a/msg/js/he.js b/msg/js/he.js
diff --git a/msg/js/hi.js b/msg/js/hi.js
diff --git a/msg/js/hr.js b/msg/js/hr.js
diff --git a/msg/js/hrx.js b/msg/js/hrx.js
diff --git a/msg/js/hu.js b/msg/js/hu.js
diff --git a/msg/js/hy.js b/msg/js/hy.js
diff --git a/msg/js/ia.js b/msg/js/ia.js
diff --git a/msg/js/id.js b/msg/js/id.js
diff --git a/msg/js/ig.js b/msg/js/ig.js
diff --git a/msg/js/inh.js b/msg/js/inh.js
diff --git a/msg/js/is.js b/msg/js/is.js
diff --git a/msg/js/it.js b/msg/js/it.js
diff --git a/msg/js/ja.js b/msg/js/ja.js
diff --git a/msg/js/ka.js b/msg/js/ka.js
diff --git a/msg/js/kab.js b/msg/js/kab.js
diff --git a/msg/js/kbd-cyrl.js b/msg/js/kbd-cyrl.js
diff --git a/msg/js/km.js b/msg/js/km.js
diff --git a/msg/js/kn.js b/msg/js/kn.js
diff --git a/msg/js/ko.js b/msg/js/ko.js
diff --git a/msg/js/ksh.js b/msg/js/ksh.js
diff --git a/msg/js/ku-latn.js b/msg/js/ku-latn.js
diff --git a/msg/js/ky.js b/msg/js/ky.js
diff --git a/msg/js/la.js b/msg/js/la.js
diff --git a/msg/js/lb.js b/msg/js/lb.js
diff --git a/msg/js/lki.js b/msg/js/lki.js
diff --git a/msg/js/lo.js b/msg/js/lo.js
diff --git a/msg/js/lrc.js b/msg/js/lrc.js
diff --git a/msg/js/lt.js b/msg/js/lt.js
diff --git a/msg/js/lv.js b/msg/js/lv.js
diff --git a/msg/js/mg.js b/msg/js/mg.js
diff --git a/msg/js/mk.js b/msg/js/mk.js
diff --git a/msg/js/ml.js b/msg/js/ml.js
diff --git a/msg/js/mnw.js b/msg/js/mnw.js
diff --git a/msg/js/ms.js b/msg/js/ms.js
diff --git a/msg/js/my.js b/msg/js/my.js
diff --git a/msg/js/mzn.js b/msg/js/mzn.js
diff --git a/msg/js/nb.js b/msg/js/nb.js
diff --git a/msg/js/ne.js b/msg/js/ne.js
diff --git a/msg/js/nl.js b/msg/js/nl.js
diff --git a/msg/js/oc.js b/msg/js/oc.js
diff --git a/msg/js/olo.js b/msg/js/olo.js
diff --git a/msg/js/pa.js b/msg/js/pa.js
diff --git a/msg/js/pl.js b/msg/js/pl.js
diff --git a/msg/js/pms.js b/msg/js/pms.js
diff --git a/msg/js/ps.js b/msg/js/ps.js
diff --git a/msg/js/pt-br.js b/msg/js/pt-br.js
diff --git a/msg/js/pt.js b/msg/js/pt.js
diff --git a/msg/js/ro.js b/msg/js/ro.js
diff --git a/msg/js/ru.js b/msg/js/ru.js
diff --git a/msg/js/sc.js b/msg/js/sc.js
diff --git a/msg/js/sco.js b/msg/js/sco.js
diff --git a/msg/js/sd.js b/msg/js/sd.js
diff --git a/msg/js/shn.js b/msg/js/shn.js
diff --git a/msg/js/si.js b/msg/js/si.js
diff --git a/msg/js/sk.js b/msg/js/sk.js
diff --git a/msg/js/skr-arab.js b/msg/js/skr-arab.js
diff --git a/msg/js/sl.js b/msg/js/sl.js
diff --git a/msg/js/smn.js b/msg/js/smn.js
diff --git a/msg/js/sq.js b/msg/js/sq.js
diff --git a/msg/js/sr-latn.js b/msg/js/sr-latn.js
diff --git a/msg/js/sr.js b/msg/js/sr.js
diff --git a/msg/js/sv.js b/msg/js/sv.js
diff --git a/msg/js/sw.js b/msg/js/sw.js
diff --git a/msg/js/ta.js b/msg/js/ta.js
diff --git a/msg/js/tcy.js b/msg/js/tcy.js
diff --git a/msg/js/te.js b/msg/js/te.js
diff --git a/msg/js/th.js b/msg/js/th.js
diff --git a/msg/js/ti.js b/msg/js/ti.js
diff --git a/msg/js/tl.js b/msg/js/tl.js
diff --git a/msg/js/tlh.js b/msg/js/tlh.js
diff --git a/msg/js/tr.js b/msg/js/tr.js
diff --git a/msg/js/ug-arab.js b/msg/js/ug-arab.js
diff --git a/msg/js/uk.js b/msg/js/uk.js
diff --git a/msg/js/ur.js b/msg/js/ur.js
diff --git a/msg/js/uz.js b/msg/js/uz.js
diff --git a/msg/js/vi.js b/msg/js/vi.js
diff --git a/msg/js/xmf.js b/msg/js/xmf.js
diff --git a/msg/js/yo.js b/msg/js/yo.js
diff --git a/msg/js/yue.js b/msg/js/yue.js
diff --git a/msg/js/zgh.js b/msg/js/zgh.js
diff --git a/msg/js/zh-hans.js b/msg/js/zh-hans.js
diff --git a/msg/js/zh-hant.js b/msg/js/zh-hant.js
diff --git a/scripts/i18n/create_messages.py b/scripts/i18n/create_messages.py
@@ -41,7 +41,7 @@ def load_constants(filename):
   for key in constant_defs:
     value = constant_defs[key]
     value = value.replace('"', '\\"')
-    constants_text += u'\nmessages["{0}"] = \"{1}\";'.format(
+    constants_text += u'\nBlockly.Msg["{0}"] = \"{1}\";'.format(
         key, value)
   return constants_text
 
@@ -88,7 +88,7 @@ def main():
       os.curdir, args.source_synonym_file))
 
   # synonym_defs is also being sorted to ensure the same order is kept
-  synonym_text = '\n'.join([u'messages["{0}"] = messages["{1}"];'
+  synonym_text = '\n'.join([u'Blockly.Msg["{0}"] = Blockly.Msg["{1}"];'
       .format(key, synonym_defs[key]) for key in sorted(synonym_defs)])
 
   # Read in constants file, which must be output in every language.
@@ -123,7 +123,7 @@ def main():
 
 'use strict';
 
-const messages = Object.create(null);
+var Blockly = Blockly || {{ Msg: Object.create(null) }};
 
 """.format(target_lang.replace('-', '.')))
         # For each key in the source language file, output the target value
@@ -138,7 +138,7 @@ def main():
             value = source_defs[key]
             comment = '  // untranslated'
           value = value.replace('"', '\\"')
-          outfile.write(u'messages["{0}"] = "{1}";{2}\n'
+          outfile.write(u'Blockly.Msg["{0}"] = "{1}";{2}\n'
               .format(key, value, comment))
 
         # Announce any keys defined only for target language.

diff --git a/scripts/package/templates/umd-msg.template b/scripts/package/templates/umd-msg.template
@@ -12,5 +12,5 @@
   }
 }(this, function() {
 <%= contents %>
-return messages;
+return Blockly.Msg;
 }));