wait #5931 @0:10

diff --git a/js/libs/fluidbook/fluidbook.l10n.js b/js/libs/fluidbook/fluidbook.l10n.js
index b6cbc869da8f3b9cb28e0c16cea6f1ae750c4e69..4b4c434684951f75143738ae01ae916d9ce236e1 100644 (file)
--- a/js/libs/fluidbook/fluidbook.l10n.js
+++ b/js/libs/fluidbook/fluidbook.l10n.js
@@ -209,9 +209,12 @@ FluidbookL10N.prototype = {
         if (str === undefined) {
             return;
         }
-        if (str.substr(0, 1) == '!') {
+        if (str.substr(0, 1) === '!') {
             return str.substr(1);
         }
+        if (str.substr(0, 1) === '~') {
+            str = str.substring(1);
+        }
 
         if (this.translations[str] == undefined || this.translations[str] == null || this.translations[str] == '') {
             if (markupIfNonAvailable == undefined || !markupIfNonAvailable) {

diff --git a/js/libs/fluidbook/fluidbook.nav.js b/js/libs/fluidbook/fluidbook.nav.js
index 72a1eade81d62e0d16ab71defc7d6d996c9f1033..9c1c1379109ec44fd05c8e53f2ecac7b4b540d78 100644 (file)
--- a/js/libs/fluidbook/fluidbook.nav.js
+++ b/js/libs/fluidbook/fluidbook.nav.js
@@ -490,7 +490,6 @@ FluidbookNav.prototype = {
                     link = this.addLink(navType, 'nav-notes', '#', 'notes', 'notes', 'notes', 'Control+Alt+N');
                 }
             } else if (icon === 'extra') {
-
                 var id = 'extra', $nav = this.getNavFromType(navType), elementID = navType + '_' + id, navExtraImage,
                     navLinkTarget = '';
 
@@ -510,7 +509,7 @@ FluidbookNav.prototype = {
                     }
                 } else if (navType === 'menu' && (this.fluidbook.settings.navExtraImage !== '' || this.fluidbook.settings.navExtraImageMobile !== '') && this.fluidbook.settings.navExtraLink !== '') {
                     navExtraImage = this.fluidbook.settings.navExtraImageMobile || this.fluidbook.settings.navExtraImage; // Fallback to desktop image
-                    link = '<a id="' + elementID + '" href="' + this.fluidbook.settings.navExtraLink + '"' + navLinkTarget + '><img class="nav-icon" src="data/images/' + navExtraImage + '"> <span class="menu-item-title">' + this.fluidbook.settings.navExtraTooltip + '</span></a>';
+                    link = '<a id="' + elementID + '" href="' + this.fluidbook.settings.navExtraLink + '"' + navLinkTarget + '><img class="nav-icon" src="data/images/' + navExtraImage + '"> <span class="menu-item-title">' + this.fluidbook.l10n.__(this.fluidbook.settings.navExtraTooltip) + '</span></a>';
                 }
 
                 if (link !== null) {
@@ -589,7 +588,7 @@ FluidbookNav.prototype = {
 
                     link = $(foundLink).find('a').append(linkIcon);
                     if (navType === 'menu' && extraType === 'icon') {
-                        $(link).append('<span class="menu-item-title">' + $(link).data('tooltip') + '</span>');
+                        $(link).append('<span class="menu-item-title">' + this.fluidbook.l10n.__($(link).data('tooltip')) + '</span>');
                     }
 
                     link = $(link).get(0);