From 264be99e3aa91f0323a7401ccb1c12ac16f0d7cb Mon Sep 17 00:00:00 2001
From: Mudassir Hafeez <41048311+mudassir-hafeez@users.noreply.github.com>
Date: Tue, 22 Sep 2020 18:00:35 +0500
Subject: [PATCH] MCKIN-24633 master PR for portuguese translation isssue
 (#302)

MCKIN-24633 PR for Portuguese translation issue
---
 .../public/js/translations/pt_BR/textjs.js    |  66 +++++++++---------
 .../translations/pt_BR/LC_MESSAGES/textjs.mo  | Bin 1120 -> 1118 bytes
 .../translations/pt_BR/LC_MESSAGES/textjs.po  |  10 +--
 setup.py                                      |   2 +-
 4 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/problem_builder/public/js/translations/pt_BR/textjs.js b/problem_builder/public/js/translations/pt_BR/textjs.js
index 5be750a9..147d780e 100644
--- a/problem_builder/public/js/translations/pt_BR/textjs.js
+++ b/problem_builder/public/js/translations/pt_BR/textjs.js
@@ -24,12 +24,12 @@
   django.catalog = django.catalog || {};
   
   var newcatalog = {
-    "All": "Tudo", 
-    "Data export failed. Reason: <%= error %>": "Falha na exporta\u00e7\u00e3o de dados. Motivo: <%= error %>", 
+    "All": "Tudo",
+    "Data export failed. Reason: <%= error %>": "Falha na exporta\u00e7\u00e3o de dados. Motivo: <%= error %>",
     "Results retrieved on <%= creation_time %> (<%= seconds %> second).": [
-      "Resultados recuperados em <%= creation_time %> (<%= segundos %> segundo).", 
-      "Resultados recuperados em <%= creation_time %> (<%= segundos %> segundos)."
-    ], 
+      "Resultados recuperados em <%= creation_time %> (<%= seconds %> segundo).",
+      "Resultados recuperados em <%= creation_time %> (<%= seconds %> segundos)."
+    ],
     "The report is currently being generated\u2026": "O relat\u00f3rio est\u00e1 sendo gerado..."
   };
   for (var key in newcatalog) {
@@ -86,40 +86,40 @@
     /* formatting library */
 
     django.formats = {
-    "DATETIME_FORMAT": "j \\d\\e F \\d\\e Y \u00e0\\s H:i", 
+    "DATETIME_FORMAT": "j \\d\\e F \\d\\e Y \u00e0\\s H:i",
     "DATETIME_INPUT_FORMATS": [
-      "%d/%m/%Y %H:%M:%S", 
-      "%d/%m/%Y %H:%M:%S.%f", 
-      "%d/%m/%Y %H:%M", 
-      "%d/%m/%Y", 
-      "%d/%m/%y %H:%M:%S", 
-      "%d/%m/%y %H:%M:%S.%f", 
-      "%d/%m/%y %H:%M", 
-      "%d/%m/%y", 
-      "%Y-%m-%d %H:%M:%S", 
-      "%Y-%m-%d %H:%M:%S.%f", 
-      "%Y-%m-%d %H:%M", 
+      "%d/%m/%Y %H:%M:%S",
+      "%d/%m/%Y %H:%M:%S.%f",
+      "%d/%m/%Y %H:%M",
+      "%d/%m/%Y",
+      "%d/%m/%y %H:%M:%S",
+      "%d/%m/%y %H:%M:%S.%f",
+      "%d/%m/%y %H:%M",
+      "%d/%m/%y",
+      "%Y-%m-%d %H:%M:%S",
+      "%Y-%m-%d %H:%M:%S.%f",
+      "%Y-%m-%d %H:%M",
       "%Y-%m-%d"
-    ], 
-    "DATE_FORMAT": "j \\d\\e F \\d\\e Y", 
+    ],
+    "DATE_FORMAT": "j \\d\\e F \\d\\e Y",
     "DATE_INPUT_FORMATS": [
-      "%d/%m/%Y", 
-      "%d/%m/%y", 
+      "%d/%m/%Y",
+      "%d/%m/%y",
       "%Y-%m-%d"
-    ], 
-    "DECIMAL_SEPARATOR": ",", 
-    "FIRST_DAY_OF_WEEK": "0", 
-    "MONTH_DAY_FORMAT": "j \\d\\e F", 
-    "NUMBER_GROUPING": "3", 
-    "SHORT_DATETIME_FORMAT": "d/m/Y H:i", 
-    "SHORT_DATE_FORMAT": "d/m/Y", 
-    "THOUSAND_SEPARATOR": ".", 
-    "TIME_FORMAT": "H:i", 
+    ],
+    "DECIMAL_SEPARATOR": ",",
+    "FIRST_DAY_OF_WEEK": "0",
+    "MONTH_DAY_FORMAT": "j \\d\\e F",
+    "NUMBER_GROUPING": "3",
+    "SHORT_DATETIME_FORMAT": "d/m/Y H:i",
+    "SHORT_DATE_FORMAT": "d/m/Y",
+    "THOUSAND_SEPARATOR": ".",
+    "TIME_FORMAT": "H:i",
     "TIME_INPUT_FORMATS": [
-      "%H:%M:%S", 
-      "%H:%M:%S.%f", 
+      "%H:%M:%S",
+      "%H:%M:%S.%f",
       "%H:%M"
-    ], 
+    ],
     "YEAR_MONTH_FORMAT": "F \\d\\e Y"
   };
 
diff --git a/problem_builder/translations/pt_BR/LC_MESSAGES/textjs.mo b/problem_builder/translations/pt_BR/LC_MESSAGES/textjs.mo
index ed70eff0f5d61ee0114a361543ed36e5aa20699e..04a9a146d845b60067f7a56eb21c3c26c6d11c87 100644
GIT binary patch
delta 40
rcmaFBagSp{4DTcc28I>P3=B#@+InMVDf474M()Y4nC-x{35yN@-USLf

delta 44
tcmcb|@qlAO4DS>M28I>P3=B#@+IC}RDKl$&X<kbH<VVb|P?k1}F#sC74DJ8`

diff --git a/problem_builder/translations/pt_BR/LC_MESSAGES/textjs.po b/problem_builder/translations/pt_BR/LC_MESSAGES/textjs.po
index e34e878d..ac4bdc19 100644
--- a/problem_builder/translations/pt_BR/LC_MESSAGES/textjs.po
+++ b/problem_builder/translations/pt_BR/LC_MESSAGES/textjs.po
@@ -3,17 +3,17 @@
 # Copyright (C) 2019 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
-# 
+#
 # #-#-#-#-#  djangojs-partial.po (PACKAGE VERSION)  #-#-#-#-#
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 # Translators:
 # Matheus Gomes Correia, 2019
 # Omar Al-Ithawi <i@omardo.com>, 2019
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
@@ -50,9 +50,9 @@ msgid "Results retrieved on <%= creation_time %> (<%= seconds %> second)."
 msgid_plural ""
 "Results retrieved on <%= creation_time %> (<%= seconds %> seconds)."
 msgstr[0] ""
-"Resultados recuperados em <%= creation_time %> (<%= segundos %> segundo)."
+"Resultados recuperados em <%= creation_time %> (<%= seconds %> segundo)."
 msgstr[1] ""
-"Resultados recuperados em <%= creation_time %> (<%= segundos %> segundos)."
+"Resultados recuperados em <%= creation_time %> (<%= seconds %> segundos)."
 
 #: public/js/instructor_tool.js:429
 msgid "The report is currently being generated…"
diff --git a/setup.py b/setup.py
index e6aabd9d..429cfec5 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@
 
 # Constants #########################################################
 
-VERSION = '4.1.1'
+VERSION = '4.1.2'
 
 # Functions #########################################################