Download as
Browse Code »

Commit 4bb4c06a30d7188d269d1e15ed78b77d32e4e578

Authored by Luan
1 parent 371644a8
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Minor fix on badge translation on templates

Showing 2 changed files with 5 additions and 4 deletions   Show diff stats
src/accounts/templates/accounts/user_detail.html
  Diff comments   View file @4bb4c06
1 {% extends "base.html" %} 1 {% extends "base.html" %}
2 2
3 -{% load i18n gravatar %} 3 +{% load i18n gravatar i18n_model %}
4 4
5 5
6 {% block head_js %} 6 {% block head_js %}
@@ -108,7 +108,8 @@ @@ -108,7 +108,8 @@
108 <div class="panel-body"> 108 <div class="panel-body">
109 <div> 109 <div>
110 {% for badge in user_.badge_set.all %} 110 {% for badge in user_.badge_set.all %}
111 - <img src="{{ badge.get_badge_url }}" title="{{ badge.description }}" /> 111 + {% translate badge as badge_trans %}
  112 + <img src="{{ badge.get_badge_url }}" title="({{ badge_trans.title }}) {{ badge_trans.description }}" />
112 {% endfor %} 113 {% endfor %}
113 </div> 114 </div>
114 </div> 115 </div>
src/colab/custom_settings.py
  Diff comments   View file @4bb4c06
@@ -8,8 +8,8 @@ TIME_ZONE = &#39;America/Sao_Paulo&#39; @@ -8,8 +8,8 @@ TIME_ZONE = &#39;America/Sao_Paulo&#39;
8 8
9 gettext = lambda s: s 9 gettext = lambda s: s
10 LANGUAGES = ( 10 LANGUAGES = (
11 - ('pt-br', gettext('Portuguese')),  
12 ('en', gettext('English')), 11 ('en', gettext('English')),
  12 + ('pt-br', gettext('Portuguese')),
13 ('es', gettext('Spanish')), 13 ('es', gettext('Spanish')),
14 ) 14 )
15 15
@@ -18,7 +18,7 @@ DJANGO_DATE_FORMAT_TO_JS = { @@ -18,7 +18,7 @@ DJANGO_DATE_FORMAT_TO_JS = {
18 'es': ('es', 'dd/MM/yyyy'), 18 'es': ('es', 'dd/MM/yyyy'),
19 } 19 }
20 20
21 -LANGUAGE_CODE = 'pt-br' 21 +LANGUAGE_CODE = 'en'
22 22
23 # The absolute path to the folder containing the attachments 23 # The absolute path to the folder containing the attachments
24 ATTACHMENTS_FOLDER_PATH = '/home/colab/trac/attachments/' 24 ATTACHMENTS_FOLDER_PATH = '/home/colab/trac/attachments/'