瀏覽代碼

Fixes the html attributes for translation options.

j8
hristoterezov 10 年之前
父節點
當前提交
6048d0a325
共有 4 個文件被更改,包括 5 次插入5 次删除
  1. 1
    1
      index.html
  2. 2
    2
      libs/app.bundle.js
  3. 1
    1
      modules/UI/util/MessageHandler.js
  4. 1
    1
      modules/translation/translation.js

+ 1
- 1
index.html 查看文件

@@ -19,7 +19,7 @@
19 19
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
20 20
     <script src="libs/toastr.js?v=1"></script><!-- notifications lib -->
21 21
     <script src="interface_config.js?v=5"></script>
22
-    <script src="libs/app.bundle.js?v=24"></script>
22
+    <script src="libs/app.bundle.js?v=25"></script>
23 23
     <script src="analytics.js?v=1"></script><!-- google analytics plugin -->
24 24
     <link rel="stylesheet" href="css/font.css?v=6"/>
25 25
     <link rel="stylesheet" href="css/toastr.css?v=1">

+ 2
- 2
libs/app.bundle.js 查看文件

@@ -5680,7 +5680,7 @@ var messageHandler = (function(my) {
5680 5680
             displayNameSpan + '<br>' +
5681 5681
             '<span class=' + cls + ' data-i18n="' + messageKey + '"' +
5682 5682
                 (messageArguments?
5683
-                    " i18n-options='" + JSON.stringify(messageArguments) + "'"
5683
+                    " data-i18n-options='" + JSON.stringify(messageArguments) + "'"
5684 5684
                     : "") + ">" +
5685 5685
             APP.translation.translateString(messageKey,
5686 5686
                 messageArguments) +
@@ -11630,7 +11630,6 @@ var defaultOptions = {
11630 11630
     detectLngQS: "lang",
11631 11631
     useCookie: false,
11632 11632
     fallbackLng: DEFAULT_LANG,
11633
-    shortcutFunction: 'defaultValue',
11634 11633
     load: "unspecific",
11635 11634
     resGetPath: 'lang/__ns__-__lng__.json',
11636 11635
     ns: {
@@ -11641,6 +11640,7 @@ var defaultOptions = {
11641 11640
     fallbackOnNull: true,
11642 11641
     fallbackOnEmpty: true,
11643 11642
     useDataAttrOptions: true,
11643
+    defaultValueFromContent: false,
11644 11644
     app: interfaceConfig.APP_NAME,
11645 11645
     getAsync: false,
11646 11646
     customLoad: function(lng, ns, options, done) {

+ 1
- 1
modules/UI/util/MessageHandler.js 查看文件

@@ -188,7 +188,7 @@ var messageHandler = (function(my) {
188 188
             displayNameSpan + '<br>' +
189 189
             '<span class=' + cls + ' data-i18n="' + messageKey + '"' +
190 190
                 (messageArguments?
191
-                    " i18n-options='" + JSON.stringify(messageArguments) + "'"
191
+                    " data-i18n-options='" + JSON.stringify(messageArguments) + "'"
192 192
                     : "") + ">" +
193 193
             APP.translation.translateString(messageKey,
194 194
                 messageArguments) +

+ 1
- 1
modules/translation/translation.js 查看文件

@@ -13,7 +13,6 @@ var defaultOptions = {
13 13
     detectLngQS: "lang",
14 14
     useCookie: false,
15 15
     fallbackLng: DEFAULT_LANG,
16
-    shortcutFunction: 'defaultValue',
17 16
     load: "unspecific",
18 17
     resGetPath: 'lang/__ns__-__lng__.json',
19 18
     ns: {
@@ -24,6 +23,7 @@ var defaultOptions = {
24 23
     fallbackOnNull: true,
25 24
     fallbackOnEmpty: true,
26 25
     useDataAttrOptions: true,
26
+    defaultValueFromContent: false,
27 27
     app: interfaceConfig.APP_NAME,
28 28
     getAsync: false,
29 29
     customLoad: function(lng, ns, options, done) {

Loading…
取消
儲存