From 27ae95f3774edbb1c43c53d92c25650a4c2288bc Mon Sep 17 00:00:00 2001
From: "S. Kozyr" <s.trump@gmail.com>
Date: Fri, 23 Feb 2024 17:39:26 +0200
Subject: [PATCH] Added some FAQ UI translations (en, ru). Added RU translation
 for /faq/android/what-android-version-can-run-organic-maps page

Signed-off-by: S. Kozyr <s.trump@gmail.com>
---
 .gitignore                                         |  1 +
 config.toml                                        |  5 +++++
 .../index.ru.md                                    | 14 ++++++++++++++
 templates/base.html                                |  6 +++---
 templates/faq/list.html                            |  4 ++--
 templates/faq/single.html                          |  8 ++++----
 6 files changed, 29 insertions(+), 9 deletions(-)
 create mode 100644 content/faq/android/what-android-version-can-run-organic-maps/index.ru.md

diff --git a/.gitignore b/.gitignore
index 011303c5..f07519b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 node_modules
 public
 translations.yaml
+.idea/*
diff --git a/config.toml b/config.toml
index bd37bde4..0397f6d0 100644
--- a/config.toml
+++ b/config.toml
@@ -42,6 +42,8 @@ install-fdroid="Install Organic Maps from F-Droid"
 language = "English"
 name = "Name"
 token = "Token"
+faq-menu-title = "F.A.Q"
+faq-questions = "questions"
 
 # Please sort all other translation sections and values in alphabetical order.
 [languages.de]
@@ -108,6 +110,9 @@ install-fdroid = "Установите Organic Maps из F-Droid"
 language = "Русский"
 name = "Название"
 token = "Токен"
+faq-menu-title = "Справка"
+faq-questions = "вопросы"
+
 [languages.tr]
 [languages.tr.translations]
 address = "Adres"
diff --git a/content/faq/android/what-android-version-can-run-organic-maps/index.ru.md b/content/faq/android/what-android-version-can-run-organic-maps/index.ru.md
new file mode 100644
index 00000000..b7438988
--- /dev/null
+++ b/content/faq/android/what-android-version-can-run-organic-maps/index.ru.md
@@ -0,0 +1,14 @@
+---
+title: Какие версии Android поддерживает Organic Maps?
+description: "Frequently asked questions for Organic Maps application"
+
+taxonomies:
+  faq: ["Android"]
+
+extra:
+  order: 10
+---
+
+Для работы Organic Maps достаточно устройства с Android 5 или выше. Если у вас самая свежая версия Android, значит Organic Maps точно заработает.
+
+Карта может работать как при наличии Google сервисов, так и без них.
diff --git a/templates/base.html b/templates/base.html
index 1110e5f5..e4d936c8 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -85,10 +85,10 @@
 
   <main>
   {% if page.taxonomies and page.taxonomies.faq %}{# Show FAQ breadcrumbs #}
-    F.A.Q.
-    {% set categories = get_taxonomy(kind='faq') | get(key="items") %}
+    {{ trans(key='faq-menu-title', lang=lang) }}
+    {% set categories = get_taxonomy(kind='faq', lang=page.lang) | get(key="items") %}
     {% for item in categories %}
-      • <a href="{{ get_taxonomy_url(kind="faq", name=item.name) }}">{{ item.name }}</a>
+      • <a href="{{ item.permalink }}">{{ item.name }}</a>
     {% endfor %}
   {% endif %}
     {% block content %}{% endblock %}
diff --git a/templates/faq/list.html b/templates/faq/list.html
index 12436dec..67930a98 100644
--- a/templates/faq/list.html
+++ b/templates/faq/list.html
@@ -5,9 +5,9 @@
 {% endblock %}
 
 {% block content %}
-  <h1>F.A.Q.</h1>
+  <h1>{{ trans(key='faq-menu-title', lang=lang) }}</h1>
   {%- for term in terms -%}
-  <h3><a href="{{term.permalink}}">{{term.name}} questions</a></h3>
+  <h3><a href="{{term.permalink}}">{{term.name}} {{ trans(key='faq-questions', lang=lang) }}</a></h3>
   <ul>
     {%- for faq_page in term.pages | sort(attribute="extra.order") -%}
       <li><a href="{{ faq_page.permalink }}">{{ faq_page.title }}</a></li>
diff --git a/templates/faq/single.html b/templates/faq/single.html
index 0e295bb3..36dda4fa 100644
--- a/templates/faq/single.html
+++ b/templates/faq/single.html
@@ -5,17 +5,17 @@
 {% endblock %}
 
 {% block content %}
-  F.A.Q.
-  {% set categories = get_taxonomy(kind='faq') | get(key="items") %}
+  {{ trans(key='faq-menu-title', lang=lang) }}
+  {% set categories = get_taxonomy(kind='faq', lang=lang) | get(key="items") %}
   {% for item in categories %}
     •
     {% if term.name == item.name %}
     <span>{{ item.name }}</span>
     {% else %}
-    <a href="{{ get_taxonomy_url(kind="faq", name=item.name) }}">{{ item.name }}</a>
+    <a href="{{ item.permalink }}">{{ item.name }}</a>
     {% endif %}
   {% endfor %}
-  <h2>{{ term.name }} questions</h2>
+  <h2>{{ term.name }} {{ trans(key='faq-questions', lang=lang) }}</h2>
   {%- for faq_page in term.pages | sort(attribute="extra.order") -%}
   <h3><a href="{{ faq_page.permalink }}">{{ faq_page.title }}</a></h3>
   {%- endfor -%}