From dc2d1462488f71f09bac405d9933e426811df343 Mon Sep 17 00:00:00 2001 From: "S. Kozyr" Date: Mon, 15 Jul 2024 10:34:24 +0300 Subject: [PATCH 01/10] Created draft for embedded faq.html. English only Signed-off-by: S. Kozyr --- content/faq/embedded-faq.md | 7 ++ templates/faq/embedded-faq.html | 161 ++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+) create mode 100644 content/faq/embedded-faq.md create mode 100644 templates/faq/embedded-faq.html diff --git a/content/faq/embedded-faq.md b/content/faq/embedded-faq.md new file mode 100644 index 00000000..aa98dd12 --- /dev/null +++ b/content/faq/embedded-faq.md @@ -0,0 +1,7 @@ +--- +title: Multilang single page FAQ +description: Multilang single page FAQ +template: "faq/embedded-faq.html" +--- + +Static FAQ page to me embedded into Android and iOS apps diff --git a/templates/faq/embedded-faq.html b/templates/faq/embedded-faq.html new file mode 100644 index 00000000..0635946f --- /dev/null +++ b/templates/faq/embedded-faq.html @@ -0,0 +1,161 @@ + + + + + Organic Maps: Frequently Asked Questions + + + + + + + + +{# List of questions #} +{% set faq_questions_en = [ + "editing/map-errors", + "map/cant-download-maps", + "map/can-not-find-position", + "map/search-cannot-find-a-place", + "app/crash", + "bookmarks/how-to-export", + "bookmarks/how-to-import" +] %} +
+

FAQ

+
    + {% for faq_slug in faq_questions_en %} + {% set faq_page_en = get_page(path = "faq/" ~ faq_slug ~ "/index.md") %} +
  • + {{ faq_page_en.title }} +
    • + {% endfor %} +
+

+ For more information please visit our web-site + organicmaps.app +

+ +{% for faq_slug in faq_questions_en %} + {% set faq_page_en = get_page(path = "faq/" ~ faq_slug ~ "/index.md") %} +
+
+

{{ faq_page_en.title }}

+
+ +
+

+ {{ faq_page_en.content | safe }} +

+
+
+{% endfor %} +
\ No newline at end of file -- 2.45.3 From 4367d6001bf466f0faf199d9bbe09add4f0dd61c Mon Sep 17 00:00:00 2001 From: "S. Kozyr" Date: Mon, 15 Jul 2024 10:56:33 +0300 Subject: [PATCH 02/10] Added translations to embedded faq Signed-off-by: S. Kozyr --- templates/faq/embedded-faq.html | 76 ++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 2 deletions(-) diff --git a/templates/faq/embedded-faq.html b/templates/faq/embedded-faq.html index 0635946f..3a01213e 100644 --- a/templates/faq/embedded-faq.html +++ b/templates/faq/embedded-faq.html @@ -8,7 +8,7 @@ + a { + color: var(--link-color); + text-decoration: none; + } + - + var elems = document.querySelectorAll('[lang="' + lang + '"]'); + // Make them visible. + for (var i = 0; i < elems.length; ++i) elems[i].style.display = "block"; + } + -{# List of questions #} -{% set faq_questions_en = [ - "map/how-to-create-a-route", - "editing/map-errors", - "map/can-not-find-position", - "map/cant-download-maps", - "map/search-cannot-find-a-place", - "app/crash", - "voice/cant-hear-instructions", - "bookmarks/how-to-export", - "bookmarks/how-to-import" -] %} + {# List of questions #} + {% set faq_questions_en = [ + "map/how-to-create-a-route", + "editing/map-errors", + "map/can-not-find-position", + "map/cant-download-maps", + "map/search-cannot-find-a-place", + "app/crash", + "voice/cant-hear-instructions", + "bookmarks/how-to-export", + "bookmarks/how-to-import" + ] %} -{% set faq_languages = ["ru", "de", "es", "fr", "pl", "pt", "pt-BR", "tr", "uk", "zh-Hans"] %} {# Predefined list of translation languages #} + {% set faq_languages = ["ru", "de", "es", "fr", "pl", "pt", "pt-BR", "tr", "uk", "zh-Hans"] %} {# Predefined list of + translation languages #} -
-

FAQ

+
+

FAQ

Часто задаваемые вопросы (FAQ)

FAQ

FAQ

@@ -148,67 +149,65 @@

常见问题

    - {% for faq_slug in faq_questions_en %} - {% set faq_page_en = get_page(path = "faq/" ~ faq_slug ~ "/index.md") %} -
  • - {{ faq_page_en.title }} - {# Add translated pages #} - {% for lang in faq_languages %} - {% set translated_faq_page = faq_page_en.translations | filter(attribute="lang", value=lang) | first %} - {% if not translated_faq_page %} - {{ throw(message="Page 'faq/" ~ faq_slug ~ "/index.md' is not translated into '" ~ lang ~ "'") }} - {% endif %} - {{ translated_faq_page.title }} - {% endfor %} -
    • - {% endfor %} + {% for faq_slug in faq_questions_en -%} + {% set faq_page_en = get_page(path = "faq/" ~ faq_slug ~ "/index.md") -%} + {% set faq_slug = faq_slug | replace(from="/", to="-") -%} +
  • + {{ faq_page_en.title }} + {#- Add translated pages -#} + {% for lang in faq_languages -%} + {% set translated_faq_page = faq_page_en.translations | filter(attribute="lang", value=lang) | first -%} + {% if not translated_faq_page -%} + {{ throw(message="Page 'faq/" ~ faq_slug ~ "/index.md' is not translated into '" ~ lang ~ "'") -}} + {%- endif %} + {{ translated_faq_page.title }} + {%- endfor %} +
    • + {% endfor %}

- {{ trans(key="more-info-om", lang="en") }} - organicmaps.app + {{ trans(key="more-info-om", lang="en") }} organicmaps.app

{% for lang in faq_languages %} -

- {{ trans(key="more-info-om", lang=lang) }} - organicmaps.app +

+ {{ trans(key="more-info-om", lang=lang) }} organicmaps.app

- {% endfor %} + {%- endfor %} +
-
+ {% for faq_slug in faq_questions_en -%} + {% set faq_page_en = get_page(path = "faq/" ~ faq_slug ~ "/index.md") -%} +
+
+

{{ faq_page_en.title }}

+ {# Add translations -#} + {% for lang in faq_languages -%} + {%- set translated_faq_page = faq_page_en.translations | filter(attribute="lang", value=lang) | first %} +

{{ translated_faq_page.title }}

+ {%- endfor %} +
-{% for faq_slug in faq_questions_en %} - {% set faq_page_en = get_page(path = "faq/" ~ faq_slug ~ "/index.md") %} -
-
-

{{ faq_page_en.title }}

- {# Add translations #} - {% for lang in faq_languages %} - {% set translated_faq_page = faq_page_en.translations | filter(attribute="lang", value=lang) | first %} -

{{ translated_faq_page.title }}

- {% endfor %} -
+
+ {{ faq_page_en.content | safe -}} +
+ {# Add translations -#} + {% for lang in faq_languages -%} + {% set translated_faq_page = faq_page_en.translations | filter(attribute="lang", value=lang) | first -%} + {% set translated_faq_page = get_page(path=translated_faq_page.path) -%} +
+ {{ translated_faq_page.content | safe }} +
+ {%- endfor %} +
+ {%- endfor %} -
- {{ faq_page_en.content | safe }} -
- {# Add translations #} - {% for lang in faq_languages %} - {% set translated_faq_page = faq_page_en.translations | filter(attribute="lang", value=lang) | first %} - {% set translated_faq_page = get_page(path=translated_faq_page.path) %} -
- {{ translated_faq_page.content | safe }} -
- {% endfor %} -
-{% endfor %} - -{{ trans(key="go-to-top", lang="en") }} - -{% for lang in faq_languages %} -{{ trans(key="go-to-top", lang=lang) }} -{% endfor %} + {{ trans(key="go-to-top", lang="en") }} + {% for lang in faq_languages -%} + {{ trans(key="go-to-top", lang=lang) }} + {% endfor %} + \ No newline at end of file -- 2.45.3