Embed locale.properties in the viewer.html for extension

diff --git a/external/webL10n/l10n.js b/external/webL10n/l10n.js
index fedf70cdea4d88ccf464252e8356ade14915930d..bb847ee10add585ab87bd6a2f9d809f89dd6c86c 100644 (file)
--- a/external/webL10n/l10n.js
+++ b/external/webL10n/l10n.js
@@ -131,7 +131,10 @@
     // check all <link type="application/l10n" href="..." /> nodes
     // and load the resource files
     var langLinks = document.querySelectorAll('link[type="application/l10n"]');
-    var langCount = langLinks.length;
+    var langLinksCount = langLinks.length;
+    var langScripts = document.querySelectorAll('script[type="application/l10n"]');
+    var langScriptCount = langScripts.length;
+    var langCount = langLinksCount + langScriptCount;
 
     // start the callback when all resources are loaded
     var onResourceLoaded = null;
@@ -165,12 +168,17 @@
     }
 
     gLanguage = lang;
-    for (var i = 0; i < langCount; i++) {
+    for (var i = 0; i < langLinksCount; i++) {
       var resource = new l10nResourceLink(langLinks[i]);
       var rv = resource.load(lang, onResourceLoaded);
       if (rv != lang) // lang not found, used default resource instead
         gLanguage = '';
     }
+    for (var i = 0; i < langScriptCount; i++) {
+      var scriptText = langScripts[i].text;
+      parse(scriptText, lang);
+      onResourceLoaded();
+    }
   }
 
   // fetch an l10n object, warn if not found

diff --git a/make.js b/make.js
index c8cd4961046849ead3de2836f875ac3b0a6c7b7a..36f4ef073bdc7e0361889088cb19787f32591198 100755 (executable)
--- a/make.js
+++ b/make.js
@@ -252,6 +252,8 @@ target.firefox = function() {
       FIREFOX_EXTENSION_NAME = 'pdf.js.xpi',
       FIREFOX_AMO_EXTENSION_NAME = 'pdf.js.amo.xpi';
 
+  var LOCALE_CONTENT = cat('web/locale.properties');
+
   target.production();
   target.buildnumber();
   cd(ROOT_DIR);
@@ -278,6 +280,8 @@ target.firefox = function() {
   // Modify the viewer so it does all the extension-only stuff.
   cd(FIREFOX_BUILD_CONTENT_DIR + '/web');
   sed('-i', /.*PDFJSSCRIPT_INCLUDE_BUNDLE.*\n/, cat(ROOT_DIR + BUILD_TARGET), 'viewer-snippet-firefox-extension.html');
+  sed('-i', /.*PDFJSSCRIPT_OTHER_SCRIPTS.*\n/, cat(ROOT_DIR + 'external/webL10n/l10n.js'), 'viewer-snippet-firefox-extension.html');
+  sed('-i', /PDFJSSCRIPT_LOCALE_DATA/, JSON.stringify({text: LOCALE_CONTENT}), 'viewer-snippet-firefox-extension.html');
   sed('-i', /.*PDFJSSCRIPT_REMOVE_CORE.*\n/g, '', 'viewer.html');
   sed('-i', /.*PDFJSSCRIPT_REMOVE_FIREFOX_EXTENSION.*\n/g, '', 'viewer.html');
   sed('-i', /.*PDFJSSCRIPT_INCLUDE_FIREFOX_EXTENSION.*\n/, cat('viewer-snippet-firefox-extension.html'), 'viewer.html');

diff --git a/web/viewer-snippet-firefox-extension.html b/web/viewer-snippet-firefox-extension.html
index 72cf3f09564ae73c274c70ba451c46c65ad587fb..d3faaae51cde70010d3ee7e5853ca0099568177f 100644 (file)
--- a/web/viewer-snippet-firefox-extension.html
+++ b/web/viewer-snippet-firefox-extension.html
@@ -1,6 +1,18 @@
 <!-- This snippet is used in firefox extension, see Makefile -->
 <base href="resource://pdf.js/web/" />
-<script type="text/javascript" src="l10n.js"></script>
+<script type="text/javascript">
+(function() {
+   // doning script creation here since resource:// urls won't work
+   // for content loading.
+   var localeData = PDFJSSCRIPT_LOCALE_DATA;
+   var script = document.createElement('script');
+   script.type = 'application/l10n';
+   script.text = localeData.text;
+   document.getElementsByTagName('head')[0].appendChild(script);
+})();
+
+/* PDFJSSCRIPT_OTHER_SCRIPTS */
+</script>
 <script type="text/javascript" id="PDFJS_SCRIPT_TAG">
 <!--
 // pdf.js is inlined here because resource:// urls won't work

diff --git a/web/viewer-snippet.html b/web/viewer-snippet.html
index 293920da7ecf50b20a4d8ddeb09f10fd96e56fa1..3d535169ee0a8ecb7a6dc7f5cdecca258729d102 100644 (file)
--- a/web/viewer-snippet.html
+++ b/web/viewer-snippet.html
@@ -1,4 +1,5 @@
 <!-- This snippet is used in production, see Makefile -->
+<link rel="resource" type="application/l10n" href="locale.properties"/>
 <script type="text/javascript" src="l10n.js"></script>
 <script type="text/javascript" src="../build/pdf.js"></script>
 <script type="text/javascript">

diff --git a/web/viewer.html b/web/viewer.html
index b90464c48657d7c67b64ff134821eb6099a4dfb3..b464b09c23658089a3833d2e17a265fb200bccca 100644 (file)
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -1,11 +1,12 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="utf-8">
     <title>PDF.js viewer</title>
     <!-- PDFJSSCRIPT_INCLUDE_FIREFOX_EXTENSION -->
 
     <link rel="stylesheet" href="viewer.css"/>
-    <link rel="resource" type="application/l10n" href="locale.properties"/>
+    <link rel="resource" type="application/l10n" href="locale.properties"/><!-- PDFJSSCRIPT_REMOVE_CORE -->
 
     <script type="text/javascript" src="compatibility.js"></script> <!-- PDFJSSCRIPT_REMOVE_FIREFOX_EXTENSION -->
     <script type="text/javascript" src="../external/webL10n/l10n.js"></script><!-- PDFJSSCRIPT_REMOVE_CORE -->