haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes the html attributes for translation options.

This commit is contained in:
hristoterezov 2015-02-27 20:05:32 +02:00
parent af682f8727
commit 6048d0a325
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

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

4
libs/app.bundle.js
View File

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

2
modules/UI/util/MessageHandler.js
View File

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

2
modules/translation/translation.js
View File

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