From ddf9fe780e25902e2e9604bbfca7cd5ba90066ab Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Mon, 13 Jun 2022 16:29:25 +0200 Subject: [PATCH 1/8] [IMP] odoo_theme: stop translating language names in the switcher MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Before this commit, the language names were translated to display "Français" instead of "French". This helped the user find their language in the switcher but it was taking too much horizontal space, and that space was not constant from one language to another. This commit removes the translations of the language names and simply goes with "FR", "NL", etc. which any user can identify as their language. task-2800937 X-original-commit: b1fa30f43115db763e0a9211b61565eb5f5a41ae --- conf.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/conf.py b/conf.py index 6c4f9f88e8..071480eb99 100644 --- a/conf.py +++ b/conf.py @@ -196,14 +196,14 @@ # The language names that should be shown in the language switcher, if the config option `languages` # is populated. If a language is passed to `languages` but is not listed here, it will not be shown. languages_names = { - 'de': 'Deutsch', - 'en': 'English', - 'es': 'Español', - 'fr': 'Français', - 'nl': 'Nederlands', - 'pt_BR': 'Português (BR)', - 'uk': 'українська', - 'zh_CN': '简体中文', + 'de': 'DE', + 'en': 'EN', + 'es': 'ES', + 'fr': 'FR', + 'nl': 'NL', + 'pt_BR': 'PT', + 'uk': 'UA', + 'zh_CN': 'ZH', } # The specifications of redirect rules used by the redirects extension. From bf1e7ee63ee7cde4d480c214675782d1e5a22e7d Mon Sep 17 00:00:00 2001 From: Elisabeth Dickinson Date: Mon, 13 Jun 2022 16:33:19 +0200 Subject: [PATCH 2/8] [IMP] odoo_theme: add subheader and adapt switchers and searchbar task-2800937 X-original-commit: 411e1cb1d3485a0b3a839676be04a2a5fd77f54b --- extensions/odoo_theme/layout.html | 11 +- .../odoo_theme/layout_templates/header.html | 23 +- .../layout_templates/language_switcher.html | 6 +- .../layout_templates/searchbox.html | 2 +- .../layout_templates/version_switcher.html | 45 ++-- .../odoo_theme/static/scss/_variables.scss | 6 +- extensions/odoo_theme/static/style.scss | 206 ++++++++---------- 7 files changed, 140 insertions(+), 159 deletions(-) diff --git a/extensions/odoo_theme/layout.html b/extensions/odoo_theme/layout.html index 39921fcd6e..e010f71a63 100644 --- a/extensions/odoo_theme/layout.html +++ b/extensions/odoo_theme/layout.html @@ -65,21 +65,16 @@ -