Changeset 7427

Timestamp:

02/23/07 17:34:55 (23 months ago)

Author:

jburke

Message:

(merge from 0.4 branch) Fixes #2211. Now web built, xdomain builds that do not have the top-level nls directory but include modules that use i18n bundles will work.

Files:

• trunk/buildscripts/makeDojoJsWeb.js (modified) (1 diff)

trunk/buildscripts/makeDojoJsWeb.js

@@ -47 +47 @@
         
         var contents = buildUtil.makeDojoJs(dependencyResult, version).dojoContents;
+        var prefixes = [["dojo", "src"]];
+
+        //Make sure any dojo.requireLocalization calls are modified
+        //so that they inform the loader of valid locales that can be loaded.
+        contents = buildUtil.modifyRequireLocalization(contents, djConfig.baseRelativePath, prefixes);
+        
+        //Convert requireLocalization calls into xdRequireLocalization calls.
+        contents = contents.replace(/dojo\.requireLocalization\s*\(/g, "dojo.xdRequireLocalization(");
         
         //Add copyright, and intern strings.
-        contents = new String(buildUtil.readFile("copyright.txt")) + buildUtil.interningRegexpMagic("xdomain", contents, djConfig.baseRelativePath, [["dojo", "src"]], [], true);
+        contents = new String(buildUtil.readFile("copyright.txt")) + buildUtil.interningRegexpMagic("xdomain", contents, djConfig.baseRelativePath, prefixes, [], true);
         
         if(xdDojoUrl){