From 510e7d80c65a07ecc5f38462e8cd52fcee7a714f Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 18:37:07 +0100 Subject: [PATCH 01/12] Attempt to add language selector --- templates/header.html | 1 + templates/lang-selector.html | 13 +++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 templates/lang-selector.html diff --git a/templates/header.html b/templates/header.html index f6e7026..3304ef5 100644 --- a/templates/header.html +++ b/templates/header.html @@ -5,5 +5,6 @@ {{ _("Menu") }} #} + {% include 'lang-selector.html' %} diff --git a/templates/lang-selector.html b/templates/lang-selector.html new file mode 100644 index 0000000..2995a22 --- /dev/null +++ b/templates/lang-selector.html @@ -0,0 +1,13 @@ +{% set alts = get_alts() %} +
+ +
+ {% for alt in alts %} + {% if this.alt != alt %} + {{ alt.name }} + {% endif %} + {% endfor %} +
+
From 1227a793cde105376e0aeb26bb4a2c2ab9284d7d Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 18:51:24 +0100 Subject: [PATCH 02/12] testing --- templates/lang-selector.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/lang-selector.html b/templates/lang-selector.html index 2995a22..b913427 100644 --- a/templates/lang-selector.html +++ b/templates/lang-selector.html @@ -1,12 +1,14 @@ {% set alts = get_alts() %}
{% for alt in alts %} {% if this.alt != alt %} - {{ alt.name }} + {% for thing in alt %} + {{ thing }} + {% endif %} {% endif %} {% endfor %}
From e3a263404873eb5b278430b5163ba7f43d2d9df7 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 18:52:29 +0100 Subject: [PATCH 03/12] fix test --- templates/lang-selector.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/lang-selector.html b/templates/lang-selector.html index b913427..245e3dd 100644 --- a/templates/lang-selector.html +++ b/templates/lang-selector.html @@ -8,7 +8,7 @@ {% if this.alt != alt %} {% for thing in alt %} {{ thing }} - {% endif %} + {% endfor %} {% endif %} {% endfor %}
From d9b29adf6b29efe8aecfece2db34967a609457b2 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 18:53:46 +0100 Subject: [PATCH 04/12] testing --- templates/lang-selector.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/templates/lang-selector.html b/templates/lang-selector.html index 245e3dd..6de7eff 100644 --- a/templates/lang-selector.html +++ b/templates/lang-selector.html @@ -6,9 +6,7 @@
{% for alt in alts %} {% if this.alt != alt %} - {% for thing in alt %} - {{ thing }} - {% endfor %} + {{ alt }} {% endif %} {% endfor %}
From 7201ebbf5f8106ac91183db96b86caa540b137d4 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 18:59:23 +0100 Subject: [PATCH 05/12] testing --- templates/lang-selector.html | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/templates/lang-selector.html b/templates/lang-selector.html index 6de7eff..0442ae8 100644 --- a/templates/lang-selector.html +++ b/templates/lang-selector.html @@ -1,13 +1,16 @@ {% set alts = get_alts() %} -
- -
- {% for alt in alts %} - {% if this.alt != alt %} - {{ alt }} - {% endif %} - {% endfor %} -
+
+
  • + {{ this.alt }} + +
    • From 2cb2610d245d9fbd3f472d6b637fc444515ea0e7 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 19:01:18 +0100 Subject: [PATCH 06/12] Revert "testing" This reverts commit 7201ebbf5f8106ac91183db96b86caa540b137d4. --- templates/lang-selector.html | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/templates/lang-selector.html b/templates/lang-selector.html index 0442ae8..6de7eff 100644 --- a/templates/lang-selector.html +++ b/templates/lang-selector.html @@ -1,16 +1,13 @@ {% set alts = get_alts() %} -
    -
  • - {{ this.alt }} - -
    • +
    + +
    + {% for alt in alts %} + {% if this.alt != alt %} + {{ alt }} + {% endif %} + {% endfor %} +
    From d1a779749d45be01d221e08cad7c1077c1a3ba83 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 19:05:31 +0100 Subject: [PATCH 07/12] testing --- assets/css/styles.css | 107 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/assets/css/styles.css b/assets/css/styles.css index b50d2db..4c47912 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -11717,3 +11717,110 @@ body { width: 400px; margin-left: -100px; } + +.dropdown { + position: relative; +} + +.dropdown-toggle::after { + display: inline-block; + width: 0; + height: 0; + margin-left: 0.255em; + vertical-align: 0.255em; + content: ""; + border-top: 0.3em solid; + border-right: 0.3em solid transparent; + border-bottom: 0; + border-left: 0.3em solid transparent; +} +.dropdown-toggle:empty::after { + margin-left: 0; +} + +.dropdown-menu { + position: absolute; + top: 100%; + left: 0; + z-index: 1030; + display: none; + float: left; + min-width: 10rem; + padding: 0.5rem 0; + margin: 0.125rem 0 0; + font-size: 1rem; + color: #212529; + text-align: left; + list-style: none; + background-color: #FFFFFF; + background-clip: padding-box; + border: 1px solid rgba(0, 0, 0, 0.15); + border-radius: 0.25rem; +} + +.dropup .dropdown-menu { + margin-top: 0; + margin-bottom: 0.125rem; +} +.dropup .dropdown-toggle::after { + display: inline-block; + width: 0; + height: 0; + margin-left: 0.255em; + vertical-align: 0.255em; + content: ""; + border-top: 0; + border-right: 0.3em solid transparent; + border-bottom: 0.3em solid; + border-left: 0.3em solid transparent; +} +.dropup .dropdown-toggle:empty::after { + margin-left: 0; +} + +.dropdown-divider { + height: 0; + margin: 0.5rem 0; + overflow: hidden; + border-top: 1px solid #e9ecef; +} + +.dropdown-item { + display: block; + width: 100%; + padding: 0.25rem 1.5rem; + clear: both; + font-weight: 400; + color: #212529; + text-align: inherit; + white-space: nowrap; + background: none; + border: 0; +} +.dropdown-item:focus, .dropdown-item:hover { + color: #16181b; + text-decoration: none; + background-color: #F8F9FA; +} +.dropdown-item.active, .dropdown-item:active { + color: #FFFFFF; + text-decoration: none; + background-color: #7D4698; +} +.dropdown-item.disabled, .dropdown-item:disabled { + color: #848E97; + background-color: transparent; +} + +.dropdown-menu.show { + display: block; +} + +.dropdown-header { + display: block; + padding: 0.5rem 1.5rem; + margin-bottom: 0; + font-size: 0.875rem; + color: #848E97; + white-space: nowrap; +} From ec774b7a5250484112aa1f9fd87ed725c5eda5cd Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 19:34:19 +0100 Subject: [PATCH 08/12] Attempt to add missing langs --- assets/css/styles.css | 12 +++++++++++ configs/i18n.ini | 2 +- databags/alternatives.ini | 39 ++++++++++++++++++++++++++++++++++++ templates/lang-selector.html | 10 ++++----- website.lektorproject | 39 ++++++++++++++++++++++++++++++++---- 5 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 databags/alternatives.ini diff --git a/assets/css/styles.css b/assets/css/styles.css index 4c47912..e6f4ed3 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -11722,6 +11722,12 @@ body { position: relative; } +.dropdown-toggle { + padding: 0.375rem 0.75rem; + background-color: white; + color: black; + +} .dropdown-toggle::after { display: inline-block; width: 0; @@ -11824,3 +11830,9 @@ body { color: #848E97; white-space: nowrap; } + +.dropdown:hover .dropdown-menu { + display: block; + overflow-y: scroll; + max-height: 350px; +} diff --git a/configs/i18n.ini b/configs/i18n.ini index 8fc6742..048dd5c 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = fr,pl,id +translations = de,es,es_419,fr,id,pl,pt,pt_BR,ru i18npath = i18n translate_paragraphwise = False url_prefix = https://queerscriptors.org/ diff --git a/databags/alternatives.ini b/databags/alternatives.ini new file mode 100644 index 0000000..f831d2a --- /dev/null +++ b/databags/alternatives.ini @@ -0,0 +1,39 @@ +[en] +url = / +language = English (en) + +[de] +url = /de/ +language = Deutsch (de) + +[es] +url = /es/ +language = Español (es) + +[es_419] +url = /es_419/ +language = Español de América (es_419) + +[fr] +language = Français (fr) +url = /fr/ + +[id] +language = Bahasa Indonesia (id) +url = /id/ + +[pl] +language = Polski (pl) +url = /pl/ + +[pt] +language = Português (pt) +url = /pt/ + +[pt-BR] +language = Português Brasil (pt-BR) +url = /pt_BR/ + +[ru] +language = Русский (ru) +url = /ru/ diff --git a/templates/lang-selector.html b/templates/lang-selector.html index 6de7eff..0c1d9de 100644 --- a/templates/lang-selector.html +++ b/templates/lang-selector.html @@ -1,12 +1,12 @@ -{% set alts = get_alts() %} +{% set alts = bag('alternatives').items() %}
    - {% for alt in alts %} - {% if this.alt != alt %} - {{ alt }} + {% for id, item in bag('alternatives').items() %} + {% if this.alt != id %} + {{ item.language }} {% endif %} {% endfor %}
    diff --git a/website.lektorproject b/website.lektorproject index 5468505..3ed24d7 100644 --- a/website.lektorproject +++ b/website.lektorproject @@ -10,17 +10,48 @@ primary = yes url_prefix = / locale = en +[alternatives.de] +name = German +url_prefix = /de/ +locale = de + +[alternatives.es] +name = Spanish +url_prefix = /es/ +locale = es + +[alternatives.es_419] +name = LatAmSpanish +url_prefix = /es_419/ +locale = es_419 + [alternatives.fr] name = French url_prefix = /fr/ locale = fr +[alternatives.id] +name = Indonesian +url_prefix = /id/ +locale = id + [alternatives.pl] name = Polish url_prefix = /pl/ locale = pl -[alternatives.id] -name = Indonesian -url_prefix = /id/ -locale = id +[alternatives.pt] +name = Portuguese +url_prefix = /pt/ +locale = pt + +[alternatives.pt_BR] +name = Portuguese Brazil +url_prefix = /pt_BR/ +locale = pt_BR + +[alternatives.ru] +name = Russian +url_prefix = /ru/ +locale = ru + From 1803c12658c61c6fbdbcfc9e0b1d5c21cb9574cf Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 19:39:25 +0100 Subject: [PATCH 09/12] Finish lang selector --- assets/css/styles.css | 6 ++++-- templates/lang-selector.html | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/assets/css/styles.css b/assets/css/styles.css index e6f4ed3..cea2972 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -11726,7 +11726,7 @@ body { padding: 0.375rem 0.75rem; background-color: white; color: black; - + box-shadow: none; } .dropdown-toggle::after { display: inline-block; @@ -11743,6 +11743,8 @@ body { .dropdown-toggle:empty::after { margin-left: 0; } +.dropdown-toggle:hover { + border-color: black; .dropdown-menu { position: absolute; @@ -11753,7 +11755,7 @@ body { float: left; min-width: 10rem; padding: 0.5rem 0; - margin: 0.125rem 0 0; + margin: 0 0 0; font-size: 1rem; color: #212529; text-align: left; diff --git a/templates/lang-selector.html b/templates/lang-selector.html index 0c1d9de..82edd02 100644 --- a/templates/lang-selector.html +++ b/templates/lang-selector.html @@ -1,6 +1,6 @@ {% set alts = bag('alternatives').items() %}
    -
    From dcfddda5c52e61acc31767e3c1ba580f15ae1bba Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 19:41:32 +0100 Subject: [PATCH 10/12] fix dropdown-toggle css --- assets/css/styles.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/css/styles.css b/assets/css/styles.css index cea2972..4c7431f 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -11726,7 +11726,7 @@ body { padding: 0.375rem 0.75rem; background-color: white; color: black; - box-shadow: none; + box-shadow: none !important; } .dropdown-toggle::after { display: inline-block; @@ -11745,6 +11745,7 @@ body { } .dropdown-toggle:hover { border-color: black; +} .dropdown-menu { position: absolute; From ba585282145d47ba231006835253bac5b16b825f Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 19:53:42 +0100 Subject: [PATCH 11/12] fixup! Finish lang selector --- databags/alternatives.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/alternatives.ini b/databags/alternatives.ini index f831d2a..0d02a0f 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -31,7 +31,7 @@ language = Português (pt) url = /pt/ [pt-BR] -language = Português Brasil (pt-BR) +language = Português Brasil (pt_BR) url = /pt_BR/ [ru] From c313688fba9ff76b7d944d1d8eacc2a562039396 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sun, 30 Oct 2022 22:50:36 +0100 Subject: [PATCH 12/12] Add czech, fix pt_BR --- configs/i18n.ini | 2 +- databags/alternatives.ini | 6 +++++- website.lektorproject | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 048dd5c..a09058f 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = de,es,es_419,fr,id,pl,pt,pt_BR,ru +translations = cs,de,es,es_419,fr,id,pl,pt,pt_BR,ru i18npath = i18n translate_paragraphwise = False url_prefix = https://queerscriptors.org/ diff --git a/databags/alternatives.ini b/databags/alternatives.ini index 0d02a0f..cc0c1fc 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -2,6 +2,10 @@ url = / language = English (en) +[cs] +url = /cs/ +language = Čeština (cs) + [de] url = /de/ language = Deutsch (de) @@ -30,7 +34,7 @@ url = /pl/ language = Português (pt) url = /pt/ -[pt-BR] +[pt_BR] language = Português Brasil (pt_BR) url = /pt_BR/ diff --git a/website.lektorproject b/website.lektorproject index 3ed24d7..6952d95 100644 --- a/website.lektorproject +++ b/website.lektorproject @@ -10,6 +10,11 @@ primary = yes url_prefix = / locale = en +[alternatives.cs] +name = Czech +url_prefix = /cs/ +locale = cs + [alternatives.de] name = German url_prefix = /de/