fix issue YahooArchive#1215 lang collection in metas is missing for c…

…ontroller
lzhan · Nov 7, 2013 · e9f8d34 · e9f8d34
1 parent 4afbcc5
commit e9f8d34
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/lib/app/addons/rs/yui.js b/lib/app/addons/rs/yui.js
@@ -56,7 +56,7 @@ YUI.add('addon-rs-yui', function(Y, NAME) {
         yuiSandboxFactory = require(libpath.join(__dirname, '..', '..', '..', 'yui-sandbox.js')),
         syntheticStat = null,
 
-        MODULE_META_ENTRIES          = ['path', 'requires', 'use', 'optional', 'skinnable', 'after', 'condition'],
+        MODULE_META_ENTRIES          = ['path', 'requires', 'use', 'optional', 'skinnable', 'after', 'condition', 'lang'],
         // TODO: revisit this list with @davglass
         MODULE_META_PRIVATE_ENTRIES  = ['after', 'expanded', 'supersedes', 'ext', '_parsed', '_inspected', 'skinCache', 'langCache'],
 
@@ -904,6 +904,10 @@ YUI.add('addon-rs-yui', function(Y, NAME) {
                 appMetaData.full[lang] = JSON.stringify(appMetaData.full[lang]);
                 yuiMetaData.base[lang] = JSON.stringify(yuiMetaData.base[lang]);
                 yuiMetaData.full[lang] = JSON.stringify(yuiMetaData.full[lang]);
+                appMetaData.base[lang] = appMetaData.base[lang].replace(/languageholder/g, lang);
+                appMetaData.full[lang] = appMetaData.full[lang].replace(/languageholder/g, lang);
+                yuiMetaData.base[lang] = yuiMetaData.base[lang].replace(/languageholder/g, lang);
+                yuiMetaData.full[lang] = yuiMetaData.full[lang].replace(/languageholder/g, lang);
 
                 for (name in conditions) {
                     if (conditions.hasOwnProperty(name)) {
@@ -955,10 +959,12 @@ YUI.add('addon-rs-yui', function(Y, NAME) {
                 name,
                 mod,
                 lang,
+                intl,
                 bundle;
 
             for (m in resolvedMods) {
                 if (resolvedMods.hasOwnProperty(m)) {
+                    intl = false;
                     module = resolvedMods[m];
 
                     mod = name = module.name;
@@ -1000,11 +1006,27 @@ YUI.add('addon-rs-yui', function(Y, NAME) {
                         // do its thing
                     }
 
+
+                    for (i = 0; i < module.requires.length; i += 1) {
+                        if (module.requires[i] === 'intl' && !module.intl && module.name.substring(0, 7) !== ('mojito-')) {
+                            intl = true;
+                        }
+                    }
+
                     modules[module.name] = {};
                     if (module.type === 'css') {
                         modules[module.name].type = 'css';
                     }
                     for (i = 0; i < MODULE_META_ENTRIES.length; i += 1) {
+
+                        if (MODULE_META_ENTRIES[i] === 'lang' && intl) {
+                            module[MODULE_META_ENTRIES[i]] = ['languageholder'];
+                        }
+
+                        if (MODULE_META_ENTRIES[i] === 'path' && module.intl) {
+                            module[MODULE_META_ENTRIES[i]] =
+                                'lang/' + module[MODULE_META_ENTRIES[i]];
+                        }
                         if (module[MODULE_META_ENTRIES[i]]) {
                             modules[module.name][MODULE_META_ENTRIES[i]] =
                                 module[MODULE_META_ENTRIES[i]];