From: Olivier Lamy <olamy@apache.org>
Date: Tue, 10 Jul 2012 10:39:42 +0000 (+0000)
Subject: make i18n more AMD compliant
X-Git-Tag: archiva-1.4-M3~525
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d3731db036b6ddd0fb6ebaad64061767b7fe45ff;p=archiva.git

make i18n more AMD compliant

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1359581 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
index b3ee4d0a8..b5dc9a0f3 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
@@ -151,7 +151,7 @@
 
 
 
-                require(['jquery','i18n','sammy','startup','domReady!'], function (domReady) {
+                require(['jquery','i18n','sammy','startup','utils','domReady!'], function (domReady) {
                     loadi18n(function () {
                       $.ajax({
                           url: "restServices/archivaUiServices/runtimeInfoService/archivaRuntimeInfo/"+usedLang(),
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
index 688bbd949..fd21e6729 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/utils.js
@@ -20,6 +20,7 @@
 define("utils",["jquery","i18n","jquery.tmpl"], function() {
 
   loadi18n=function(loadCallback){
+    $.log("loadi18n");
     var browserLang = usedLang();
     $.log("use browserLang:"+browserLang);
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js
index d8d3ae804..75794bb3c 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/jquery.i18n.properties-1.0.9.js
@@ -12,6 +12,18 @@
  * 
  *****************************************************************************/
 
+(function($, window) {
+  (function(factory){
+    // Support module loading scenarios
+    if (typeof define === 'function' && define.amd){
+      // AMD Anonymous Module
+      define(['jquery'], factory);
+    } else {
+      // No module loader (plain <script> tag) - put directly in global namespace
+      $.sammy = window.Sammy = factory($);
+    }
+  })
+
 (function($) {
 $.i18n = {};
 
@@ -478,5 +490,6 @@ String.prototype.split = function (separator, limit) {
     return cbSplit(this, separator, limit);
 };
 
-})(jQuery);
-                
\ No newline at end of file
+});
+
+})(jQuery, window);
\ No newline at end of file