[Libreoffice-commits] online.git: loleaflet/js

[Libreoffice Gerrit user]

 loleaflet/js/global.js |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 64ec399f54a7c3fa41019711b60222a0cb7dda64
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 16 00:38:40 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 16 00:45:00 2018 +0200

    If the language is de-CH, change 'ß' in a de(-DE) translation to 'ss'
    
    Swiss Standard German does not use ß, but otherwise (to the best of my
    knowledge) the same German translation as for Germany should be OK.
    
    Handled for the mobile app case, and for Online's messages only here.
    Will be handled separately in core for its messages.
    
    Change-Id: Ic8891b5bb340b841c3faa8f8b591a39e4f3f330a

diff --git a/loleaflet/js/global.js b/loleaflet/js/global.js
index a0e4c2ce1..c7fed9b39 100644
--- a/loleaflet/js/global.js
+++ b/loleaflet/js/global.js
@@ -34,7 +34,11 @@ global._ = function (string) {
 		// We use another approach just for iOS for now.
 		if (window.LOCALIZATIONS.hasOwnProperty(string)) {
 			// window.webkit.messageHandlers.debug.postMessage('_(' + string + '): YES: ' + window.LOCALIZATIONS[string]);
-			return window.LOCALIZATIONS[string];
+			var result = window.LOCALIZATIONS[string];
+			if (window.LANG === 'de-CH') {
+				result = result.replace(/ß/g, 'ss');
+			}
+			return result;
 		} else {
 			// window.webkit.messageHandlers.debug.postMessage('_(' + string + '): NO');
 			return string;