[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/html

[Libreoffice Gerrit user]

 loleaflet/html/loleaflet.html.m4 |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 7def3ed260d7e9542c504b744788e0b49fefc2f0
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Apr 22 16:08:49 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Apr 22 16:20:12 2019 +0300

    There is no l10n directory with localisation JSON files in the iOS app
    
    The localisation is handled differently on iOS, see the
    L10N_IOS_ALL_JS stuff in loleaflet/Makefile.am and the script
    loleaflet/util/create-l10n-all-js.pl.
    
    That part of loleaflet.html is not needed in the iOS app. Whether it
    will be needed in the Android app remains to be seen. Possibly we will
    want to handle localisation in that the same way as in the iOS app. Or
    not. So for now, do this change only for iOS.

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 7854ed0c2..2e6fb751c 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -59,11 +59,14 @@ ifelse(MOBILEAPP,[true],
 ifelse(IOSAPP,[true],
   [<link rel="stylesheet" href="Branding/branding.css">])
 ifelse(MOBILEAPP,[true],
-  [<link rel="localizations" href="l10n/uno-localizations-override.json" type="application/vnd.oftn.l10n+json"/>
-   <link rel="localizations" href="l10n/localizations.json" type="application/vnd.oftn.l10n+json"/>
-   <link rel="localizations" href="l10n/locore-localizations.json" type="application/vnd.oftn.l10n+json"/>
-   <link rel="localizations" href="l10n/help-localizations.json" type="application/vnd.oftn.l10n+json"/>
-   <link rel="localizations" href="l10n/uno-localizations.json" type="application/vnd.oftn.l10n+json"/>],
+  [
+   ifelse(IOSAPP,[true],
+     [],
+     [<link rel="localizations" href="l10n/uno-localizations-override.json" type="application/vnd.oftn.l10n+json"/>
+      <link rel="localizations" href="l10n/localizations.json" type="application/vnd.oftn.l10n+json"/>
+      <link rel="localizations" href="l10n/locore-localizations.json" type="application/vnd.oftn.l10n+json"/>
+      <link rel="localizations" href="l10n/help-localizations.json" type="application/vnd.oftn.l10n+json"/>
+      <link rel="localizations" href="l10n/uno-localizations.json" type="application/vnd.oftn.l10n+json"/>])],
   [<link rel="localizations" href="%SERVICE_ROOT%/loleaflet/%VERSION%/l10n/uno-localizations-override.json" type="application/vnd.oftn.l10n+json"/>
    <link rel="localizations" href="%SERVICE_ROOT%/loleaflet/%VERSION%/l10n/localizations.json" type="application/vnd.oftn.l10n+json"/>
    <link rel="localizations" href="%SERVICE_ROOT%/loleaflet/%VERSION%/l10n/locore-localizations.json" type="application/vnd.oftn.l10n+json"/>