loleaflet/debug/document/loleaflet.html | 1 + loleaflet/html/loleaflet.html.m4 | 6 ++++-- loleaflet/l10n/uno-localizations-override.json | 5 +++++ loleaflet/l10n/uno/de-override.json | 3 +++ loleaflet/l10n/uno/es-override.json | 4 ++++ 5 files changed, 17 insertions(+), 2 deletions(-)
New commits: commit 68228fe506536dbbf50f3b8cf3eef5866459ba37 Author: Andras Timar <andras.ti...@collabora.com> AuthorDate: Fri Jan 18 16:39:36 2019 +0100 Commit: Andras Timar <andras.ti...@collabora.com> CommitDate: Fri Jan 18 16:41:54 2019 +0100 loleaflet: add framework to override localizations coming from core + es and de fixes Change-Id: I97ad332c543f120e01563d19607c404b41aaa364 Reviewed-on: https://gerrit.libreoffice.org/66624 Reviewed-by: Andras Timar <andras.ti...@collabora.com> Tested-by: Andras Timar <andras.ti...@collabora.com> diff --git a/loleaflet/debug/document/loleaflet.html b/loleaflet/debug/document/loleaflet.html index 63ac680c6..868e4f504 100644 --- a/loleaflet/debug/document/loleaflet.html +++ b/loleaflet/debug/document/loleaflet.html @@ -26,6 +26,7 @@ <link rel="stylesheet" href="/loleaflet/%VERSION%/smartmenus/sm-core-css.css" /> <link rel="stylesheet" href="/loleaflet/%VERSION%/smartmenus/sm-simple.css" /> <link rel="stylesheet" href="/loleaflet/%VERSION%/jqueryui/1.11.1/themes/ui-lightness/jquery-ui.css"> +<link rel="localizations" href="/loleaflet/%VERSION%/l10n/uno-localizations-override.json" type="application/vnd.oftn.l10n+json" /> <link rel="localizations" href="/loleaflet/%VERSION%/l10n/localizations.json" type="application/vnd.oftn.l10n+json"/> <link rel="localizations" href="/loleaflet/%VERSION%/l10n/locore-localizations.json" type="application/vnd.oftn.l10n+json" /> <link rel="localizations" href="/loleaflet/%VERSION%/l10n/help-localizations.json" type="application/vnd.oftn.l10n+json"/> diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4 index 9814f4906..358437802 100644 --- a/loleaflet/html/loleaflet.html.m4 +++ b/loleaflet/html/loleaflet.html.m4 @@ -56,11 +56,13 @@ ifelse(MOBILEAPP,[true], )dnl <!--%BRANDING_CSS%--> <!-- add your logo here --> ifelse(MOBILEAPP,[true], - [<link rel="localizations" href="l10n/localizations.json" type="application/vnd.oftn.l10n+json"/> + [<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/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"/> <link rel="localizations" href="%SERVICE_ROOT%/loleaflet/%VERSION%/l10n/help-localizations.json" type="application/vnd.oftn.l10n+json"/> <link rel="localizations" href="%SERVICE_ROOT%/loleaflet/%VERSION%/l10n/uno-localizations.json" type="application/vnd.oftn.l10n+json"/>] diff --git a/loleaflet/l10n/uno-localizations-override.json b/loleaflet/l10n/uno-localizations-override.json new file mode 100644 index 000000000..5eb810132 --- /dev/null +++ b/loleaflet/l10n/uno-localizations-override.json @@ -0,0 +1,5 @@ +{ + "en": false, + "de": "l10n/uno/de-override.json", + "es": "l10n/uno/es-override.json" +} diff --git a/loleaflet/l10n/uno/de-override.json b/loleaflet/l10n/uno/de-override.json new file mode 100644 index 000000000..45969bffe --- /dev/null +++ b/loleaflet/l10n/uno/de-override.json @@ -0,0 +1,3 @@ +{ +"Zoom In":"Vergrößern" +} diff --git a/loleaflet/l10n/uno/es-override.json b/loleaflet/l10n/uno/es-override.json new file mode 100644 index 000000000..0704dda94 --- /dev/null +++ b/loleaflet/l10n/uno/es-override.json @@ -0,0 +1,4 @@ +{ +"Clone":"Copiar formato", +"Italic":"Italica" +} _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits