Merge pull request #20913 from yurenju/branding

Bug 996479 - {{browserBrandShortName}} is displayed instead of Firefox O... r=@cctuan
mozilla-b2g · Jun 25, 2014 · f99a96a · f99a96a
2 parents 73b9c78 + 74b1161
commit f99a96a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 7 deletions.
diff --git a/build/multilocale.js b/build/multilocale.js
@@ -13,7 +13,7 @@ const RE_INI_FILE = /locales[\/\\].+\.ini$/;
 const RE_PROPERTIES_FILE = /\.([\w-]+)\.properties$/;
 const MODNAME = 'multilocale';
 
-function L10nManager(gaiaDir, localesFilePath, localeBasedir) {
+function L10nManager(gaiaDir, localesFilePath, localeBasedir, official) {
   function checkArg(arg) {
     return Boolean(arg);
   }
@@ -33,8 +33,8 @@ function L10nManager(gaiaDir, localesFilePath, localeBasedir) {
     }
   });
 
-  [this.locales, this.localeBasedir, this.gaiaDir] =
-    [Object.keys(utils.getJSON(localesFile)), baseDir.path, gaiaDir];
+  [this.locales, this.localeBasedir, this.gaiaDir, this.official] =
+    [Object.keys(utils.getJSON(localesFile)), baseDir.path, gaiaDir, official];
 
 
   /**
@@ -122,6 +122,21 @@ function L10nManager(gaiaDir, localesFilePath, localeBasedir) {
       ini[locale].forEach(function(path) {
         var targetFile = utils.getFile(iniFile.parent.path, path);
         var propFile = getPropertiesFile(webapp, targetFile.path);
+        if (utils.isSubjectToBranding(propFile.parent.path)) {
+          var brandings = {
+            target: { original: targetFile },
+            src: { original: propFile }
+          };
+          for (var key in brandings) {
+            brandings[key].modified = brandings[key].original.parent.clone();
+            brandings[key].modified.append((self.official === '1') ?
+              'official' : 'unofficial');
+            brandings[key].modified.append(brandings[key].original.leafName);
+          }
+          targetFile = brandings.target.modified;
+          propFile = brandings.src.modified;
+        }
+
         if (!propFile.exists()) {
           utils.log(MODNAME, 'Properties file not found: ' + propFile.path);
           return;
@@ -400,7 +415,8 @@ function execute(options) {
   var l10nManager = new L10nManager(
     options.GAIA_DIR,
     options.LOCALES_FILE,
-    localeBasedir);
+    localeBasedir,
+    options.OFFICIAL);
 
   gaia.webapps.forEach(function(webapp) {
     if (utils.isExternalApp(webapp)) {

diff --git a/build/utils.js b/build/utils.js
@@ -19,7 +19,7 @@ function isNode() {
 }
 
 function isSubjectToBranding(path) {
-  return /shared[\/\\][a-zA-Z]+[\/\\]branding$/.test(path) ||
+  return /shared[\/\\]?[a-zA-Z]*[\/\\]?branding$/.test(path) ||
          /branding[\/\\]initlogo.png/.test(path);
 }
 

diff --git a/build/webapp-optimize.js b/build/webapp-optimize.js
@@ -104,7 +104,7 @@ function optimize_getFileContent(webapp, htmlFile, relativePath) {
     }
     file.append(name);
     if (utils.isSubjectToBranding(file.path)) {
-      file.append((config.OFFICIAL == 1) ? 'official' : 'unofficial');
+      file.append((config.OFFICIAL === '1') ? 'official' : 'unofficial');
     }
   });
 

diff --git a/build/webapp-shared.js b/build/webapp-shared.js
@@ -148,7 +148,7 @@ WebappShared.prototype.pushResource = function(path) {
   path.split('/').forEach(function(segment) {
     file.append(segment);
     if (utils.isSubjectToBranding(file.path)) {
-      file.append((this.config.OFFICIAL == 1) ? 'official' : 'unofficial');
+      file.append((this.config.OFFICIAL === '1') ? 'official' : 'unofficial');
     }
   }.bind(this));