Merge 1a7939b into dbec6b9

plonegovbr · Oct 19, 2018 · eddf893 · eddf893
2 parents dbec6b9 + 1a7939b
commit eddf893
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 2.0a8 (unreleased)
 ^^^^^^^^^^^^^^^^^^
 
-- Nothing changed yet.
+- Corrige o tile de Agenda quando a lingua é diferente de Português Brasileiro (fecha `#149 <https://github.com/plonegovbr/brasil.gov.agenda/issues/149>`_).
+  [rodfersou]
 
 
 2.0a7 (2018-09-28)

diff --git a/src/brasil/gov/agenda/browser/mixin.py b/src/brasil/gov/agenda/browser/mixin.py
@@ -13,12 +13,11 @@ def _translate(self, msgid, locale='plonelocales', mapping=None):
         tool = api.portal.get_tool('translation_service')
         portal_state = getMultiAdapter((self.context, self.request),
                                        name=u'plone_portal_state')
-        current_language = portal_state.language()
+        language = portal_state.language()
         # XXX: Por que é retornado 'pt-br' do portal_state ao invés de 'pt_BR'?
         # Quando uso 'pt-br' ao invés de 'pt_BR', não pega a tradução quando
         # feita de forma manual.
-        target_language = ('pt_BR' if current_language == 'pt-br'
-                           else self.current_language)
+        target_language = 'pt_BR' if language == 'pt-br' else language
         return tool.translate(msgid,
                               locale,
                               mapping=mapping,