[tor-commits] [tpo/staging] Start addressing issues with ltr/rtl locales

[emmapeel at torproject.org]

commit 056a6ab8a9118a7c09d87aac14ae87b69a035c65
Author: hiro <hiro at torproject.org>
Date:   Mon Nov 25 19:02:46 2019 +0100

    Start addressing issues with ltr/rtl locales
---
 templates/about.html    | 3 ++-
 templates/homepage.html | 3 ++-
 templates/layout.html   | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/templates/about.html b/templates/about.html
index 18c1e5a..03dcdbd 100644
--- a/templates/about.html
+++ b/templates/about.html
@@ -3,7 +3,8 @@
     {% include 'header.html' %}
     <div class="container-fluid">
       <div class="row flex-xl-nowrap">
-        <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}">
+        {% set locale = bag('alternatives', alternative) %}
+        <main role="main" class="mx-auto col-12 {{ locale.order) }} {{ locale.direction }}">
           {% if this.path == "/about" %}
             {% set p1 = this.children.get('history') %}
             <div class="container py-3 mt-5 content">
diff --git a/templates/homepage.html b/templates/homepage.html
index 0710d17..a092ef7 100644
--- a/templates/homepage.html
+++ b/templates/homepage.html
@@ -7,7 +7,8 @@
     </div>
     <div class="container-fluid">
       <div class="row flex-xl-nowrap">
-        <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}">
+        {% set locale = bag('alternatives', alternative) %}
+        <main role="main" class="mx-auto col-12 {{ locale.order) }} {{ locale.direction }}">
           {% include this.html %}
           {% if this.parent.path != "/download" %}
             <div class="container pt-5 hero">
diff --git a/templates/layout.html b/templates/layout.html
index ab0e998..5fa0153 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -3,7 +3,8 @@
     {% include 'header.html' %}
     <div class="container-fluid">
       <div class="row flex-xl-nowrap">
-        <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}">
+        {% set locale = bag('alternatives', alternative) %}
+        <main role="main" class="mx-auto col-12 {{ locale.order) }} {{ locale.direction }}">
           <div class="container py-3 mt-5 preamble">
             {{ this.body }}
           </div>