Merge pull request #1972 from edx-solutions/release-candidate

[RC: 1.54.0] Review sync up of master with release candidate

common/static/common/js/discussion/views/discussion_inline_view.js

@@ -223,6 +223,7 @@
             this.toggleDiscussionBtn.addClass('shown');
             this.toggleDiscussionBtn.find('.button-text').text(gettext('Hide Discussion'));
             this.showed = true;
+            this.$('label[for=anonymous]').removeClass('selected');
             $('.new-post-btn').focusout();
             $('.thread-title').focus();
         },

common/static/common/templates/discussion/thread-list-item.underscore

@@ -26,7 +26,15 @@
       <span class="forum-nav-thread-title"><%- title %></span>
       <% if(typeof(username) !== "undefined" && typeof(created_at) !== "undefined") { %>
         <div class="posted-details">
-          <%- gettext("discussion posted") %> <span class="timeago" title="<%- created_at %>"><%- created_at %></span>
+          <%
+            var post_type;
+            if (thread_type === "discussion") {
+               post_type = gettext("discussion posted");
+            } else {
+                post_type = gettext("question posted");
+            }
+          %>
+          <%= post_type %> <span class="timeago" title="<%- created_at %>"><%- created_at %></span>
            <%- gettext("by") %> <span class="username"><%- username %></span>
         </div>
       <% } %>

conf/locale/ar/LC_MESSAGES/djangojs.po

@@ -2351,7 +2351,7 @@ msgstr ""
 
 #: common/static/common/js/discussion/views/discussion_thread_list_view.js
 msgid "No posts matched your query."
-msgstr ""
+msgstr "لا توجد منشورات تطابق استعلامك."
 
 #: common/static/common/js/discussion/views/discussion_thread_list_view.js
 msgid "Show posts by {username}."
@@ -6972,7 +6972,7 @@ msgstr ""
 
 #: common/static/common/templates/discussion/new-post-visibility.underscore
 msgid "This post will be visible to everyone."
-msgstr ""
+msgstr "سيكون هذا المنشور مرئيًا للجميع"
 
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Add a Post"
@@ -7070,6 +7070,14 @@ msgstr "سؤال مُجاب عليه"
 msgid "unanswered question"
 msgstr "سؤال غير مُجاب عليه"
 
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "discussion posted"
+msgstr "مناقشة نشرت"
+
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "question posted"
+msgstr "نُشر السؤال قبل"
+
 #: common/static/common/templates/discussion/thread-list-item.underscore
 #: common/static/common/templates/discussion/thread-show.underscore
 msgid "Pinned"
@@ -7147,7 +7155,11 @@ msgstr "إضافة تعليق "
 #: common/static/common/templates/discussion/thread-show.underscore
 #, python-format
 msgid "discussion posted %(time_ago)s by %(author)s"
-msgstr "مناقشة نشرت %(time_ago)s by %(author)s"
+msgstr "مناقشة نشرت %(time_ago)s بواسطة %(author)s"
+
+#: wiki/templates/wiki/includes/revision_info.html
+msgid "by"
+msgstr "بواسطة"
 
 #: common/static/common/templates/discussion/thread-show.underscore
 #, python-format

conf/locale/de_DE/LC_MESSAGES/djangojs.po

@@ -7106,6 +7106,14 @@ msgstr "beantwortete Frage"
 msgid "unanswered question"
 msgstr "unbeantwortete Frage"
 
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "discussion posted"
+msgstr "Diskussion wurde vor"
+
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "question posted"
+msgstr "Frage wurde vor"
+
 #: common/static/common/templates/discussion/thread-list-item.underscore
 #: common/static/common/templates/discussion/thread-show.underscore
 msgid "Pinned"
@@ -7181,6 +7189,10 @@ msgstr "Einen Kommentar hinzufügen"
 msgid "discussion posted %(time_ago)s by %(author)s"
 msgstr "Diskussion wurde vor %(time_ago)s eröffnet durch  %(author)s"
 
+#: wiki/templates/wiki/includes/revision_info.html
+msgid "by"
+msgstr "durch"
+
 #: common/static/common/templates/discussion/thread-show.underscore
 #, python-format
 msgid "question posted %(time_ago)s by %(author)s"

conf/locale/es_419/LC_MESSAGES/djangojs.po

@@ -7381,6 +7381,14 @@ msgstr "pregunta respondida"
 msgid "unanswered question"
 msgstr "pregunta sin responder"
 
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "discussion posted"
+msgstr "discusión publicada"
+
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "question posted"
+msgstr "pregunta publicada"
+
 #: common/static/common/templates/discussion/thread-list-item.underscore
 #: common/static/common/templates/discussion/thread-show.underscore
 msgid "Pinned"

conf/locale/fr/LC_MESSAGES/django.po

@@ -26379,7 +26379,7 @@ msgstr ""
 
 #: wiki/templates/wiki/includes/revision_info.html
 msgid "by"
-msgstr ""
+msgstr "par"
 
 #: wiki/templates/wiki/includes/revision_info.html
 msgid "restored"

conf/locale/fr/LC_MESSAGES/djangojs.po

@@ -7189,10 +7189,22 @@ msgstr "Discussion"
 msgid "answered question"
 msgstr "Question répondue"
 
+#: wiki/templates/wiki/includes/revision_info.html
+msgid "by"
+msgstr "par"
+
 #: common/static/common/templates/discussion/thread-list-item.underscore
 msgid "unanswered question"
 msgstr "Question non répondue"
 
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "discussion posted"
+msgstr "discussion publiée"
+
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "question posted"
+msgstr "question publiée"
+
 #: common/static/common/templates/discussion/thread-list-item.underscore
 #: common/static/common/templates/discussion/thread-show.underscore
 msgid "Pinned"

conf/locale/ja_JP/LC_MESSAGES/djangojs.po

@@ -2369,7 +2369,7 @@ msgstr ""
 #, javascript-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
+msgstr[0] "%d日"
 
 #: common/static/js/src/jquery.timeago.locale.js
 msgid "about a month"
@@ -6699,6 +6699,14 @@ msgstr "回答済の質問"
 msgid "unanswered question"
 msgstr "未回答の質問"
 
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "discussion posted"
+msgstr "前に投稿したディスカッション"
+
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "question posted"
+msgstr "前に投稿した質問"
+
 #: common/static/common/templates/discussion/thread-list-item.underscore
 #: common/static/common/templates/discussion/thread-show.underscore
 msgid "Pinned"

conf/locale/ko_KR/LC_MESSAGES/djangojs.po

@@ -2417,7 +2417,7 @@ msgstr ""
 #: common/static/common/templates/discussion/new-post.underscore
 #: common/static/common/templates/discussion/thread-edit.underscore
 msgid "Title"
-msgstr ""
+msgstr "제목"
 
 #. Translators: this is a message from the raw HTML editor displayed in the
 #. browser when a user needs to edit HTML
@@ -10554,6 +10554,10 @@ msgstr "답변이 없는 질문"
 msgid "discussion posted"
 msgstr "토론이 게시됨"
 
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "question posted"
+msgstr "이(가) 게시한 질문"
+
 #: common/static/common/templates/discussion/thread-list-item.underscore
 #: common/static/common/templates/discussion/thread-show.underscore
 #: common/templates/js/discussion/thread-show.underscore
@@ -11071,3 +11075,7 @@ msgstr "제목은 비워둘 수 없습니다."
 #: discussions/views/new_post_view_spec.js
 msgid "Body can't be empty"
 msgstr "본문은 비워둘 수 없습니다."
+
+#: common/static/common/templates/discussion/new-post-visibility.underscore
+msgid "This post will be visible to everyone."
+msgstr "이 게시물은 모든 사용자에게 표시됩니다."

conf/locale/pl/LC_MESSAGES/django.po

@@ -206,6 +206,10 @@ msgstr "Nie udało się zaktualizować zdjęcia profilowego"
 msgid "invalid_password"
 msgstr "invalid_password"
 
+#: wiki/templates/wiki/includes/revision_info.html
+msgid "by"
+msgstr "przez"
+
 #: edx_solutions_api_integration/users/views.py:796
 #, python-brace-format
 msgid ""

conf/locale/pl/LC_MESSAGES/djangojs.po

@@ -437,6 +437,10 @@ msgstr "pytanie bez odpowiedzi"
 msgid "discussion posted"
 msgstr "opublikowana dyskusja"
 
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "question posted"
+msgstr "opublikowane pytanie"
+
 #: common/static/common/templates/discussion/thread-list-item.underscore
 #: common/static/common/templates/discussion/thread-show.underscore
 #: common/templates/js/discussion/thread-show.underscore
@@ -572,6 +576,10 @@ msgstr "Dodaj komentarz"
 msgid "discussion posted %(time_ago)s by %(author)s"
 msgstr "opublikowana dyskusja %(time_ago)s przez %(author)s"
 
+#: wiki/templates/wiki/includes/revision_info.html
+msgid "by"
+msgstr "przez"
+
 #: common/static/common/templates/discussion/thread-show.underscore
 #: test_root/staticfiles/common/templates/discussion/thread-show.underscore
 #: test_root/staticfiles/xmodule_js/common_static/common/templates/discussion/thread-show.underscore
@@ -1346,3 +1354,15 @@ msgstr "tytuł nie może być pusty"
 #: discussions/views/new_post_view_spec.js
 msgid "Body can't be empty"
 msgstr "treść nie może być pusta"
+
+#: common/static/common/templates/discussion/new-post-visibility.underscore
+msgid "This post will be visible to everyone."
+msgstr "Ten post będzie widoczny dla wszystkich"
+
+
+#: common/static/js/src/jquery.timeago.locale.js
+#, javascript-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dzień"
+msgstr[1] "%d dni"

conf/locale/pt_BR/LC_MESSAGES/django.po

@@ -17009,7 +17009,7 @@ msgstr "Resultados:"
 
 #: lms/templates/discussion/_discussion_inline.html
 msgid "Topic:"
-msgstr ""
+msgstr "Tópico:"
 
 #: lms/templates/discussion/_discussion_inline.html
 msgid "Show Discussion"

conf/locale/pt_BR/LC_MESSAGES/djangojs.po

@@ -2404,7 +2404,7 @@ msgstr ""
 
 #: common/static/common/js/discussion/views/discussion_thread_list_view.js
 msgid "No posts matched your query."
-msgstr ""
+msgstr "Nenhuma publicação corresponde à sua consulta."
 
 #: common/static/common/js/discussion/views/discussion_thread_list_view.js
 msgid "Show posts by {username}."
@@ -6861,7 +6861,7 @@ msgstr ""
 
 #: common/static/common/templates/discussion/new-post-visibility.underscore
 msgid "This post will be visible to everyone."
-msgstr ""
+msgstr "Esta publicação estará visível para todos."
 
 #: common/static/common/templates/discussion/new-post.underscore
 msgid "Add a Post"
@@ -6959,6 +6959,14 @@ msgstr "questão respondida"
 msgid "unanswered question"
 msgstr "questão não respondida"
 
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "discussion posted"
+msgstr "discussão postada"
+
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "question posted"
+msgstr "pergunta postada"
+
 #: common/static/common/templates/discussion/thread-list-item.underscore
 #: common/static/common/templates/discussion/thread-show.underscore
 msgid "Pinned"
@@ -7032,7 +7040,11 @@ msgstr "Adicionar comentário"
 #: common/static/common/templates/discussion/thread-show.underscore
 #, python-format
 msgid "discussion posted %(time_ago)s by %(author)s"
-msgstr "discussão postada %(time_ago)s by %(author)s"
+msgstr "discussão postada %(time_ago)s por %(author)s"
+
+#: wiki/templates/wiki/includes/revision_info.html
+msgid "by"
+msgstr "por"
 
 #: common/static/common/templates/discussion/thread-show.underscore
 #, python-format
@@ -7165,7 +7177,7 @@ msgstr "Ganhe pontos pelo seu engajamento adicionando uma nova publicação ou r
 
 #: lms/djangoapps/discussion/static/discussion/templates/user-profile.underscore
 msgid "All Posts"
-msgstr ""
+msgstr "Todas as Publicações"
 
 #: lms/djangoapps/support/static/support/templates/certificates.underscore
 msgid "username or email"

conf/locale/zh_CN/LC_MESSAGES/djangojs.po

@@ -6905,6 +6905,14 @@ msgstr "已回复的问题"
 msgid "unanswered question"
 msgstr "待回复的问题"
 
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "discussion posted"
+msgstr "发布此讨论帖"
+
+#: common/static/common/templates/discussion/thread-list-item.underscore
+msgid "question posted"
+msgstr "发布此问题"
+
 #: common/static/common/templates/discussion/thread-list-item.underscore
 #: common/static/common/templates/discussion/thread-show.underscore
 msgid "Pinned"
@@ -6979,6 +6987,10 @@ msgstr "添加评论"
 msgid "discussion posted %(time_ago)s by %(author)s"
 msgstr "由%(author)s于%(time_ago)s发布此讨论帖"
 
+#: wiki/templates/wiki/includes/revision_info.html
+msgid "by"
+msgstr "由"
+
 #: common/static/common/templates/discussion/thread-show.underscore
 #, python-format
 msgid "question posted %(time_ago)s by %(author)s"

lms/djangoapps/discussion/static/discussion/js/discussion_router.js

@@ -140,6 +140,7 @@
                         complete: function() {
                             var attr = self.newPostView.$el.fadeIn(200).focus();
                             $('.thread-title').focus();
+                            $('label[for=anonymous]').removeClass('selected');
                             return attr;
                         }
                     });

lms/djangoapps/discussion/static/discussion/templates/discussion-home.underscore

@@ -8,7 +8,7 @@
         <h3 class="sub-heading"><%- gettext("How to use discussions") %></h3>
 
         <div class="discussion-wrapper">
-          <h4><%- gettext("find discussions") %></h4>
+          <h4><%- gettext("Find discussions") %></h4>
           <p><%- gettext("Use the") %>
             <span color='brand-color'><%- gettext("All Topics") %></span>
             <%- gettext("menu to see a list of all topics.") %></p>