From ceebf96bb8612990e701ce7e35636f472c45905b Mon Sep 17 00:00:00 2001 From: David Baumgold Date: Tue, 26 Nov 2013 16:37:29 -0500 Subject: [PATCH] i18n for forums --- .../django_comment_common/models.py | 9 ++-- .../discussion/discussion_module_view.coffee | 6 +-- .../views/discussion_thread_list_view.coffee | 4 +- .../views/discussion_thread_show_view.coffee | 10 ++-- .../views/response_comment_show_view.coffee | 4 +- .../views/thread_response_show_view.coffee | 12 ++--- .../discussion/_discussion_module.html | 2 +- .../discussion/_filter_dropdown.html | 2 +- .../discussion/_inline_new_post.html | 2 +- lms/templates/discussion/_new_post.html | 2 +- .../discussion/_thread_list_template.html | 2 +- .../discussion/_underscore_templates.html | 48 +++++++++---------- lms/templates/discussion/_user_profile.html | 25 ++++++++-- 13 files changed, 74 insertions(+), 54 deletions(-) diff --git a/common/djangoapps/django_comment_common/models.py b/common/djangoapps/django_comment_common/models.py index c345f2691937..59f4daf58c8d 100644 --- a/common/djangoapps/django_comment_common/models.py +++ b/common/djangoapps/django_comment_common/models.py @@ -5,16 +5,17 @@ from django.dispatch import receiver from django.db.models.signals import post_save +from django.utils.translation import ugettext_noop from student.models import CourseEnrollment from xmodule.modulestore.django import modulestore from xmodule.course_module import CourseDescriptor -FORUM_ROLE_ADMINISTRATOR = 'Administrator' -FORUM_ROLE_MODERATOR = 'Moderator' -FORUM_ROLE_COMMUNITY_TA = 'Community TA' -FORUM_ROLE_STUDENT = 'Student' +FORUM_ROLE_ADMINISTRATOR = ugettext_noop('Administrator') +FORUM_ROLE_MODERATOR = ugettext_noop('Moderator') +FORUM_ROLE_COMMUNITY_TA = ugettext_noop('Community TA') +FORUM_ROLE_STUDENT = ugettext_noop('Student') @receiver(post_save, sender=CourseEnrollment) diff --git a/common/static/coffee/src/discussion/discussion_module_view.coffee b/common/static/coffee/src/discussion/discussion_module_view.coffee index e23215561e80..79e472db0c66 100644 --- a/common/static/coffee/src/discussion/discussion_module_view.coffee +++ b/common/static/coffee/src/discussion/discussion_module_view.coffee @@ -30,7 +30,7 @@ if Backbone? else @newPostForm.show() @toggleDiscussionBtn.addClass('shown') - @toggleDiscussionBtn.find('.button-text').html("Hide Discussion") + @toggleDiscussionBtn.find('.button-text').html(gettext("Hide Discussion")) @$("section.discussion").slideDown() @showed = true @@ -41,7 +41,7 @@ if Backbone? hideDiscussion: -> @$("section.discussion").slideUp() @toggleDiscussionBtn.removeClass('shown') - @toggleDiscussionBtn.find('.button-text').html("Show Discussion") + @toggleDiscussionBtn.find('.button-text').html(gettext("Show Discussion")) @showed = false toggleDiscussion: (event) -> @@ -49,7 +49,7 @@ if Backbone? @hideDiscussion() else @toggleDiscussionBtn.addClass('shown') - @toggleDiscussionBtn.find('.button-text').html("Hide Discussion") + @toggleDiscussionBtn.find('.button-text').html(gettext("Hide Discussion")) if @retrieved @$("section.discussion").slideDown() diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index 57385c15bd7e..3637e7fefa6e 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -119,12 +119,12 @@ if Backbone? renderMorePages: -> if @displayedCollection.hasMorePages() - @$(".post-list").append("
  • Load more
    • ") + @$(".post-list").append("
  • " + gettext('Load more')+ "
    • ") loadMorePages: (event) -> if event event.preventDefault() - @$(".more-pages").html('
    Loading more threads
    ') + @$(".more-pages").html('
    ' + gettext("Loading more threads") + '
    ') @$(".more-pages").addClass("loading") loadingDiv = @$(".more-pages .loading-animation") DiscussionUtil.makeFocusTrap(loadingDiv) diff --git a/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee index 1a3f8929e131..ebd1c29d7d7e 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee @@ -51,22 +51,22 @@ if Backbone? @$("[data-role=thread-flag]").addClass("flagged") @$("[data-role=thread-flag]").removeClass("notflagged") @$(".discussion-flag-abuse").attr("aria-pressed", "true") - @$(".discussion-flag-abuse .flag-label").html("Misuse Reported") + @$(".discussion-flag-abuse .flag-label").html(gettext("Misuse Reported")) else @$("[data-role=thread-flag]").removeClass("flagged") @$("[data-role=thread-flag]").addClass("notflagged") @$(".discussion-flag-abuse").attr("aria-pressed", "false") - @$(".discussion-flag-abuse .flag-label").html("Report Misuse") + @$(".discussion-flag-abuse .flag-label").html(gettext("Report Misuse")) renderPinned: => if @model.get("pinned") @$("[data-role=thread-pin]").addClass("pinned") @$("[data-role=thread-pin]").removeClass("notpinned") - @$(".discussion-pin .pin-label").html("Pinned") + @$(".discussion-pin .pin-label").html(gettext("Pinned")) else @$("[data-role=thread-pin]").removeClass("pinned") @$("[data-role=thread-pin]").addClass("notpinned") - @$(".discussion-pin .pin-label").html("Pin Thread") + @$(".discussion-pin .pin-label").html(gettext("Pin Thread")) updateModelDetails: => @@ -139,7 +139,7 @@ if Backbone? if textStatus == 'success' @model.set('pinned', true) error: => - $('.admin-pin').text("Pinning not currently available") + $('.admin-pin').text(gettext("Pinning not currently available")) unPin: -> url = @model.urlFor("unPinThread") diff --git a/common/static/coffee/src/discussion/views/response_comment_show_view.coffee b/common/static/coffee/src/discussion/views/response_comment_show_view.coffee index 0e51d6a11a5c..6ea324a52ec9 100644 --- a/common/static/coffee/src/discussion/views/response_comment_show_view.coffee +++ b/common/static/coffee/src/discussion/views/response_comment_show_view.coffee @@ -24,7 +24,7 @@ if Backbone? addReplyLink: () -> if @model.hasOwnProperty('parent') - name = @model.parent.get('username') ? "anonymous" + name = @model.parent.get('username') ? gettext("anonymous") html = "@#{name}: " p = @$('.response-body p:first') p.prepend(html) @@ -36,7 +36,7 @@ if Backbone? markAsStaff: -> if DiscussionUtil.isStaff(@model.get("user_id")) - @$el.find("a.profile-link").after('staff') + @$el.find("a.profile-link").after('' + gettext('staff') + '') else if DiscussionUtil.isTA(@model.get("user_id")) @$el.find("a.profile-link").after('Community  TA') diff --git a/common/static/coffee/src/discussion/views/thread_response_show_view.coffee b/common/static/coffee/src/discussion/views/thread_response_show_view.coffee index eaed0568c2dd..c9433fc7803c 100644 --- a/common/static/coffee/src/discussion/views/thread_response_show_view.coffee +++ b/common/static/coffee/src/discussion/views/thread_response_show_view.coffee @@ -25,7 +25,7 @@ if Backbone? @delegateEvents() if window.user.voted(@model) @$(".vote-btn").addClass("is-cast") - @$(".vote-btn span.sr").html("votes (click to remove your vote)") + @$(".vote-btn span.sr").html(gettext("votes (click to remove your vote)")) @renderAttrs() @renderFlagged() @$el.find(".posted-details").timeago() @@ -41,7 +41,7 @@ if Backbone? markAsStaff: -> if DiscussionUtil.isStaff(@model.get("user_id")) @$el.addClass("staff") - @$el.prepend('
    staff
    ') + @$el.prepend('
    ' + gettext('staff') + '
    ') else if DiscussionUtil.isTA(@model.get("user_id")) @$el.addClass("community-ta") @$el.prepend('
    Community TA
    ') @@ -51,10 +51,10 @@ if Backbone? @$(".vote-btn").toggleClass("is-cast") if @$(".vote-btn").hasClass("is-cast") @vote() - @$(".vote-btn span.sr").html("votes (click to remove your vote)") + @$(".vote-btn span.sr").html(gettext("votes (click to remove your vote)")) else @unvote() - @$(".vote-btn span.sr").html("votes (click to vote)") + @$(".vote-btn span.sr").html(gettext("votes (click to vote)")) vote: -> url = @model.urlFor("upvote") @@ -107,12 +107,12 @@ if Backbone? @$("[data-role=thread-flag]").addClass("flagged") @$("[data-role=thread-flag]").removeClass("notflagged") @$(".discussion-flag-abuse").attr("aria-pressed", "true") - @$(".discussion-flag-abuse .flag-label").html("Misuse Reported") + @$(".discussion-flag-abuse .flag-label").html(gettext("Misuse Reported")) else @$("[data-role=thread-flag]").removeClass("flagged") @$("[data-role=thread-flag]").addClass("notflagged") @$(".discussion-flag-abuse").attr("aria-pressed", "false") - @$(".discussion-flag-abuse .flag-label").html("Report Misuse") + @$(".discussion-flag-abuse .flag-label").html(gettext("Report Misuse")) updateModelDetails: => @renderFlagged() diff --git a/lms/templates/discussion/_discussion_module.html b/lms/templates/discussion/_discussion_module.html index 00f6c94801a9..b95bce1f07d6 100644 --- a/lms/templates/discussion/_discussion_module.html +++ b/lms/templates/discussion/_discussion_module.html @@ -2,6 +2,6 @@ <%include file="_underscore_templates.html" />
    - Show Discussion + ${_("Show Discussion")} ${_("New Post")}
    diff --git a/lms/templates/discussion/_filter_dropdown.html b/lms/templates/discussion/_filter_dropdown.html index c70fcb47cf88..b108be6d2e09 100644 --- a/lms/templates/discussion/_filter_dropdown.html +++ b/lms/templates/discussion/_filter_dropdown.html @@ -27,7 +27,7 @@
    - +