From a70094114595b6d563a1e526576311e685879065 Mon Sep 17 00:00:00 2001 From: Wolfgang Kaltz Date: Tue, 24 Oct 2017 15:59:20 +0200 Subject: [PATCH 1/2] for issue #3162 --- doc/integrator/internationalization.rst | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/integrator/internationalization.rst b/doc/integrator/internationalization.rst index 9bcbc0ed35..6667937151 100644 --- a/doc/integrator/internationalization.rst +++ b/doc/integrator/internationalization.rst @@ -9,13 +9,13 @@ Internationalization ngeo and server --------------- -In the ``.mk`` file define the supported language with (default): +In the file ``.mk``, define the supported languages with (default): .. code:: make LANGUAGES ?= en fr de -In the ``vars_.yaml`` file define the available and default language: +In the file ``vars_.yaml``, define the available and default locales: .. code:: yaml @@ -24,24 +24,30 @@ In the ``vars_.yaml`` file define the available and default language: default_locale_name: fr available_locale_names: [en, fr, de] -Build your application +In the file ``language_mapping``, define any desired locale variants, for example: -The file to translate are: +.. code:: make + + fr=fr-ch + +Build your application. + +The files to translate are: * ``demo/locale//LC_MESSAGES/demo-client.po`` for ngeo client -* ``demo/locale//LC_MESSAGES/demo-server.po`` for the server part (Should be empty for ngeo interfaces) +* ``demo/locale//LC_MESSAGES/demo-server.po`` for the server part (should be empty for ngeo interfaces) .. note:: - All the ``#, fuzzy`` strings should be verified ans the line should be removed. - (if the line is not removed the localisation will not be used.) + All the ``#, fuzzy`` strings should be verified and the line should be removed. + (If the line is not removed, the localisation will not be used.) ---- CGXP ---- Translations of the browser interfaces (main viewer, edit interfaces and APIs) -are included in two kinds of Javascript files stored in +are included in two kinds of Javascript files, stored in ``/static/js/Proj/Lang/``: * ``.js`` is used to translate data-related strings such as layernames or From 448051b9c78f21daf3eba3e945dcce5cd7c7d858 Mon Sep 17 00:00:00 2001 From: Wolfgang Kaltz Date: Wed, 25 Oct 2017 14:16:25 +0200 Subject: [PATCH 2/2] nicer sentence --- doc/integrator/internationalization.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/integrator/internationalization.rst b/doc/integrator/internationalization.rst index 6667937151..454fc0d09a 100644 --- a/doc/integrator/internationalization.rst +++ b/doc/integrator/internationalization.rst @@ -39,8 +39,8 @@ The files to translate are: .. note:: - All the ``#, fuzzy`` strings should be verified and the line should be removed. - (If the line is not removed, the localisation will not be used.) + All the ``#, fuzzy`` strings should be verified and the line should be removed + (if the line is not removed, the localisation will not be used). ---- CGXP