diff --git a/opac/webapp/main/views.py b/opac/webapp/main/views.py index 3d6a8d9e9..8c5da197e 100644 --- a/opac/webapp/main/views.py +++ b/opac/webapp/main/views.py @@ -73,7 +73,8 @@ def add_collection_to_g(): @main.before_app_request def add_langs(): - session["langs"] = current_app.config.get("LANGUAGES") + g.langs = current_app.config.get("LANGUAGES") + g.lang = get_locale() @main.after_request @@ -82,13 +83,7 @@ def add_header(response): "CACHE_CONTROL_MAX_AGE_HEADER" ) response.headers["x-content-type-options"] = "nosniff" - return response - - -@main.after_request -def add_language_code(response): - language = session.get("lang", get_locale()) - response.set_cookie("language", language) + response.vary.add("Accept-Language") return response @@ -101,7 +96,7 @@ def add_forms_to_g(): @main.before_app_request def add_scielo_org_config_to_g(): - language = session.get("lang", get_locale()) + language = get_locale() scielo_org_links = { # if language doesnt exists set the 'en' to SciELO ORG links. key: url.get(language, "en") @@ -113,17 +108,18 @@ def add_scielo_org_config_to_g(): @babel.localeselector def get_locale(): langs = current_app.config.get("LANGUAGES") - lang_from_headers = request.accept_languages.best_match(list(langs.keys())) - if "lang" not in list(session.keys()): - session["lang"] = lang_from_headers + # If user explicitly set language via set_locale, use that + if "lang" in session: + return session["lang"] - if not lang_from_headers and not session["lang"]: - # Caso não seja possível detectar o idioma e não tenhamos a chave lang - # no seção, fixamos o idioma padrão. - session["lang"] = current_app.config.get("BABEL_DEFAULT_LOCALE") + # Otherwise, use Accept-Language header + lang_from_headers = request.accept_languages.best_match(list(langs.keys())) + if lang_from_headers: + return lang_from_headers - return session["lang"] + # Default locale + return current_app.config.get("BABEL_DEFAULT_LOCALE") @main.route("/set_locale//") @@ -151,16 +147,13 @@ def get_lang_from_session(): Tenta retornar o idioma da seção, caso não consiga retorna BABEL_DEFAULT_LOCALE. """ - try: - return session["lang"] - except KeyError: - return current_app.config.get("BABEL_DEFAULT_LOCALE") + return get_locale() @main.route("/") @cache.cached(key_prefix=cache_key_with_lang) def index(): - language = session.get("lang", get_locale()) + language = get_locale() news = controllers.get_latest_news_by_lang(language) tweets = controllers.get_collection_tweets() @@ -261,7 +254,7 @@ def collection_list_thematic(): @main.route("/journals/feed/") @cache.cached(key_prefix=cache_key_with_lang) def collection_list_feed(): - language = session.get("lang", get_locale()) + language = get_locale() collection = controllers.get_current_collection() title = "SciELO - %s - %s" % ( @@ -327,7 +320,7 @@ def collection_list_feed(): @main.route("/about/", methods=["GET"]) @cache.cached(key_prefix=cache_key_with_lang_with_qs) def about_collection(slug_name=None): - language = session.get("lang", get_locale()) + language = get_locale() context = {} page = None @@ -486,7 +479,7 @@ def journal_detail(url_seg): abort(404, JOURNAL_UNPUBLISH + _(journal.unpublish_reason)) # todo: ajustar para que seja só noticias relacionadas ao periódico - language = session.get("lang", get_locale()) + language = get_locale() news = controllers.get_latest_news_by_lang(language) # Press releases @@ -576,7 +569,7 @@ def journal_feed(url_seg): subtitle=utils.get_label_issue(last_issue), ) - feed_language = session.get("lang", get_locale()) + feed_language = get_locale() feed_language = feed_language[:2].lower() for article in articles: @@ -607,7 +600,7 @@ def journal_feed(url_seg): @main.route("/journal//about/", methods=["GET"]) @cache.cached(key_prefix=cache_key_with_lang) def about_journal(url_seg): - language = session.get("lang", get_locale()) + language = get_locale() journal = controllers.get_journal_by_url_seg(url_seg) content = None @@ -834,7 +827,7 @@ def issue_grid(url_seg): abort(404, JOURNAL_UNPUBLISH + _(journal.unpublish_reason)) # idioma da sessão - language = session.get("lang", get_locale()) + language = get_locale() # A ordenação padrão da função ``get_issues_by_jid``: "-year", "-volume", "-order" issues_data = controllers.get_issues_for_grid_by_jid(journal.id, is_public=True) @@ -881,7 +874,7 @@ def issue_toc(url_seg, url_seg_issue): filter_section_enable = bool(current_app.config["FILTER_SECTION_ENABLE"]) # idioma da sessão - language = session.get("lang", get_locale()) + language = get_locale() # obtém o issue issue = controllers.get_issue_by_url_seg(url_seg, url_seg_issue) @@ -1045,7 +1038,7 @@ def issue_feed(url_seg, url_seg_issue): subtitle=utils.get_label_issue(issue), ) - feed_language = session.get("lang", get_locale()) + feed_language = get_locale() for article in articles: # ######### TODO: Revisar ######### diff --git a/opac/webapp/templates/admin/opac_base.html b/opac/webapp/templates/admin/opac_base.html index a71426188..2bc211f32 100644 --- a/opac/webapp/templates/admin/opac_base.html +++ b/opac/webapp/templates/admin/opac_base.html @@ -30,7 +30,7 @@ {% for k,v in config.LANGUAGES.items() %} - {% if k == session['lang'] %} + {% if k == g.lang %} {{ v }} {% else %} {{ v }} diff --git a/opac/webapp/templates/article/includes/alternative_header.html b/opac/webapp/templates/article/includes/alternative_header.html index 9c12e30e9..bc5059273 100644 --- a/opac/webapp/templates/article/includes/alternative_header.html +++ b/opac/webapp/templates/article/includes/alternative_header.html @@ -45,7 +45,7 @@

- {%- set menu_logo_url = cimages.get_menu_logo(g.collection, session.lang)|default('')|trim -%} + {%- set menu_logo_url = cimages.get_menu_logo(g.collection, g.lang)|default('')|trim -%} {%- if menu_logo_url -%} {{ cimages.render_logo(menu_logo_url, coll_macro.get_collection_name(), img_class='img-fluid') }} {%- else -%} @@ -72,7 +72,7 @@

  • - + Busca
    • diff --git a/opac/webapp/templates/article/includes/header.html b/opac/webapp/templates/article/includes/header.html index e5bea02ff..1e239a22a 100644 --- a/opac/webapp/templates/article/includes/header.html +++ b/opac/webapp/templates/article/includes/header.html @@ -38,7 +38,7 @@ {% include "collection/includes/nav.html" %}

    - {%- set header_logo_url = cimages.get_header_logo(g.collection, session.lang)|default('')|trim -%} + {%- set header_logo_url = cimages.get_header_logo(g.collection, g.lang)|default('')|trim -%} {%- if header_logo_url -%} {{ cimages.render_logo(header_logo_url, coll_macro.get_collection_name(), img_class='img-fluid scielo__logo-img mt-1 ms-5') }} {%- else -%} diff --git a/opac/webapp/templates/article/includes/recent_articles_row.html b/opac/webapp/templates/article/includes/recent_articles_row.html index 2cf36060d..f8e34903e 100644 --- a/opac/webapp/templates/article/includes/recent_articles_row.html +++ b/opac/webapp/templates/article/includes/recent_articles_row.html @@ -5,10 +5,10 @@
    {% trans%}Volume{% endtrans %}: {{ article.issue.volume }} - {% trans%}Publicado em{% endtrans %}: {{ article.publication_date }}
    - {% if session.lang %} + {% if g.lang %} - {{ article.get_title_by_lang(session.lang[:2])|default(_('Documento sem título'), true)|striptags|capitalize }} + {{ article.get_title_by_lang(g.lang[:2])|default(_('Documento sem título'), true)|striptags|capitalize }} {% endif %} diff --git a/opac/webapp/templates/base.html b/opac/webapp/templates/base.html index b72f343df..abe847e21 100644 --- a/opac/webapp/templates/base.html +++ b/opac/webapp/templates/base.html @@ -146,7 +146,7 @@

    {% trans %}Mensagem{% endtrans %}

    // Garante que o valor do campo share_url é a URL corrente. $('#share_url').val(window.location.href); - //moment.locale('{{ session.lang }}'); + //moment.locale('{{ g.lang }}'); //$("#date").text(moment().format("L HH:mm:ss ZZ")); diff --git a/opac/webapp/templates/collection/includes/header.html b/opac/webapp/templates/collection/includes/header.html index 942a87809..8dfc9af39 100644 --- a/opac/webapp/templates/collection/includes/header.html +++ b/opac/webapp/templates/collection/includes/header.html @@ -91,7 +91,7 @@
    - {%- set logo_url = img_macro.get_home_logo(g.collection, session.lang)|default('')|trim -%} + {%- set logo_url = img_macro.get_home_logo(g.collection, g.lang)|default('')|trim -%} {%- if logo_url -%} {{ img_macro.render_logo(logo_url, coll_macro.get_collection_name()) }} {%- else -%} diff --git a/opac/webapp/templates/collection/includes/levelMenu_search.html b/opac/webapp/templates/collection/includes/levelMenu_search.html index 3d890dcdf..87566252f 100644 --- a/opac/webapp/templates/collection/includes/levelMenu_search.html +++ b/opac/webapp/templates/collection/includes/levelMenu_search.html @@ -4,7 +4,7 @@
    diff --git a/opac/webapp/templates/collection/includes/nav.html b/opac/webapp/templates/collection/includes/nav.html index 27bef6a87..49b1bdb5c 100644 --- a/opac/webapp/templates/collection/includes/nav.html +++ b/opac/webapp/templates/collection/includes/nav.html @@ -9,7 +9,7 @@
    - {%- set header_logo_url = cimages.get_header_logo(g.collection, session.lang)|default('')|trim -%} + {%- set header_logo_url = cimages.get_header_logo(g.collection, g.lang)|default('')|trim -%} {%- if header_logo_url -%} {{ cimages.render_logo(header_logo_url, coll_macro.get_collection_name(), img_class='img-fluid scielo__logo-img my-1 ms-5') }} {%- else -%} diff --git a/opac/webapp/templates/journal/includes/levelMenu.html b/opac/webapp/templates/journal/includes/levelMenu.html index adeb3b8e5..36539f324 100644 --- a/opac/webapp/templates/journal/includes/levelMenu.html +++ b/opac/webapp/templates/journal/includes/levelMenu.html @@ -59,7 +59,7 @@
    - {% trans %}Buscar{% endtrans %} + {% trans %}Buscar{% endtrans %} {% if journal.scielo_issn or journal.eletronic_issn or journal.print_issn %} show_chart {% trans %}Métricas{% endtrans %} @@ -92,7 +92,7 @@ {% trans %}Todos{% endtrans %} - {% trans %}Buscar{% endtrans %} + {% trans %}Buscar{% endtrans %} {% if journal.scielo_issn or journal.eletronic_issn or journal.print_issn %} {% trans %}Métricas{% endtrans %} {% else %} diff --git a/opac/webapp/templates/journal/includes/meta.html b/opac/webapp/templates/journal/includes/meta.html index b69c2c57d..8031947c2 100755 --- a/opac/webapp/templates/journal/includes/meta.html +++ b/opac/webapp/templates/journal/includes/meta.html @@ -3,6 +3,6 @@ - + diff --git a/opac/webapp/templates/macros/collection.html b/opac/webapp/templates/macros/collection.html index 5be43731a..27246a4f1 100644 --- a/opac/webapp/templates/macros/collection.html +++ b/opac/webapp/templates/macros/collection.html @@ -1,10 +1,10 @@ {% macro get_collection_name() -%} - {%- if session.lang == 'pt_BR' and g.collection.name_pt -%} + {%- if g.lang == 'pt_BR' and g.collection.name_pt -%} {{ g.collection.name_pt }} - {%- elif session.lang == 'en' and g.collection.name_en-%} + {%- elif g.lang == 'en' and g.collection.name_en-%} {{ g.collection.name_en }} - {%- elif session.lang == 'es' and g.collection.name_es-%} + {%- elif g.lang == 'es' and g.collection.name_es-%} {{ g.collection.name_es }} {%- else -%} {{ g.collection.name }} diff --git a/opac/webapp/utils/caching.py b/opac/webapp/utils/caching.py index 8625f8fa0..452186db6 100644 --- a/opac/webapp/utils/caching.py +++ b/opac/webapp/utils/caching.py @@ -1,7 +1,8 @@ # Redis Cache Key Generation: import hashlib -from flask import current_app, request, session +from flask import current_app, request +from flask_babelex import get_locale def _make_querystring_hash(): @@ -35,12 +36,11 @@ def cache_key_with_lang(): """ Função chamada no decorator @cache.cached Retorna a chave para usar no cache (redis) usando: - - o códiog do idioma armazenado na sessão (ou o default se não tiver) + - o código do idioma detectado via Accept-Language ou sessão - o path do request """ - default_lang = current_app.config.get("BABEL_DEFAULT_LOCALE") - language = session.get("lang", default_lang) + language = str(get_locale()) return _cache_key_format(language, request.path) @@ -48,12 +48,11 @@ def cache_key_with_lang_with_qs(): """ Função chamada no decorator @cache.cached Retorna a chave para usar no cache (redis) usando: - - o códiog do idioma armazenado na sessão (ou o default se não tiver) + - o código do idioma detectado via Accept-Language ou sessão - o path do request - o hash gerado a partir dos parametros da querystring """ - default_lang = current_app.config.get("BABEL_DEFAULT_LOCALE") - language = session.get("lang", default_lang) + language = str(get_locale()) qs_hash = _make_querystring_hash() return _cache_key_format(language, request.path, qs_hash)