Download as
Browse Code »

Commit 1c074167fe5a32389214380a922642db9b4386dc

Authored by Sergio Oliveira
2 parents 31499efd 5505fb3b
Exists in master and in 31 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, 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_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd

Merge branch 'fix_locale' into 'master' 

Fix super_archives translations

This Merge Request fixes Super Archives translations in dev environment and adds them to the file MANIFEST.in.

The commits of this merge request (2b5b7cce and 5505fb3b) must be in the branch "spb-release/3.0".

See merge request !79
Showing 3 changed files with 2 additions and 0 deletions   Show diff stats
@@ -2,6 +2,7 @@ include README.rst @@ -2,6 +2,7 @@ include README.rst
2 include MANIFEST.in 2 include MANIFEST.in
3 recursive-include colab/static * 3 recursive-include colab/static *
4 recursive-include colab/locale * 4 recursive-include colab/locale *
  5 +recursive-include colab/super_archives/locale *
5 recursive-include colab/proxy/noosfero/static * 6 recursive-include colab/proxy/noosfero/static *
6 recursive-include colab *.html *.txt *.xml 7 recursive-include colab *.html *.txt *.xml
7 recursive-include misc * 8 recursive-include misc *
colab/settings.py
  Diff comments   View file @1c07416
@@ -209,6 +209,7 @@ AUTHENTICATION_BACKENDS = ( @@ -209,6 +209,7 @@ AUTHENTICATION_BACKENDS = (
209 209
210 LOCALE_PATHS = ( 210 LOCALE_PATHS = (
211 os.path.join(BASE_DIR, 'locale'), 211 os.path.join(BASE_DIR, 'locale'),
  212 + os.path.join(BASE_DIR, 'super_archives/locale'),
212 ) 213 )
213 214
214 AUTH_USER_MODEL = 'accounts.User' 215 AUTH_USER_MODEL = 'accounts.User'
colab/super_archives/locale/pt_BR/LC_MESSAGES/django.mo
View file @1c07416
No preview for this file type