From 786b67e8101665b1fea900976c51e9c10cb3f846 Mon Sep 17 00:00:00 2001 From: Marco Bonetti Date: Tue, 8 Mar 2016 09:50:22 +0100 Subject: [PATCH] adds an explicit test to detect zh_Hans (for #161) --- rosetta/locale/uk/LC_MESSAGES/django.mo | Bin 2167 -> 4721 bytes rosetta/tests/tests.py | 6 ++++ .../locale/zh_Hans/LC_MESSAGES/django.po | 34 ++++++++++++++++++ testproject/settings.py | 2 ++ 4 files changed, 42 insertions(+) create mode 100644 testproject/locale/zh_Hans/LC_MESSAGES/django.po diff --git a/rosetta/locale/uk/LC_MESSAGES/django.mo b/rosetta/locale/uk/LC_MESSAGES/django.mo index fa2316da4373afd9207760ea42c517d3fd47580e..d94dc107a55f64400ef52c777c5c11090cd80923 100644 GIT binary patch literal 4721 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 Y+3B>tY@A;Y5f98#A;gO@W#z8^4XV@c(f|Me delta 673 zcmXxhPiT^19Ki8M_qy3qr{-!#4J%)!Bs3uqb_k+D-86`T*u{pWS;^FHfvJo-1Rb7A z7@dMHox~vwhIQ)@LC@Q*i-)>JgY6XE`u^VR$NRjW=Y9VEp65MC{tmasQR}55j#5rg zK2uIo9(i~X`*;Np(2px#r4HjIoX0#`Si&6MMIQBL(*72se7{4PKbrUvLrS&O7b+1t z#*>bHlm!0ZG#;B$Du|1i#thElb)3T@%KQ!7Cdn>t@tyNA7r$a0e_{qL7L`P@*kOOQ zLM1@M2+2r&!Xx+%ZsIE5M@ejeHjZ!^f1s=rW7jiy7MC!O z9`<*$mjM!tbwe_g#U9im7wT%vo6a#L~$H|$io z(rly~=j@bTo4TOCTV;LAm(;I)3&#tU^=hK{pw=vx>WSNxdnHw<*Y4CyjfSpGpVt>> zZfwu{^Im;5@Jl}oUe5MR-)TD?-jAJEX4mXEo67W@t~5%M^MtM!)SuDvJYfdf4%v&$ eG6OSYz*93cBlDg)G<{%t+w}FdxvD-D(SHHI%6F0g diff --git a/rosetta/tests/tests.py b/rosetta/tests/tests.py index eb7eba5..2defbc6 100644 --- a/rosetta/tests/tests.py +++ b/rosetta/tests/tests.py @@ -50,6 +50,7 @@ class RosettaTestCase(TestCase): ('fr_FR.utf8', 'French (France), UTF8'), ('bs-Cyrl-BA', u'Bosnian (Cyrillic) (Bosnia and Herzegovina)'), ('yy-Anot', u'Yet Another dummy language'), + ('zh_Hans', u'Chinese (simplified)'), ) self.__session_engine = settings.SESSION_ENGINE @@ -720,6 +721,11 @@ class RosettaTestCase(TestCase): r = self.client.get(reverse('rosetta-pick-file')) self.assertTrue(os.path.normpath('locale/yy_Anot/LC_MESSAGES/django.po') in str(r.content)) + def test_38_issue_161_more_weird_locales(self): + r = self.client.get(reverse('rosetta-pick-file') + '?filter=all') + r = self.client.get(reverse('rosetta-pick-file')) + self.assertTrue(os.path.normpath('locale/zh_Hans/LC_MESSAGES/django.po') in str(r.content)) + # Stubbed access control function def no_access(user): diff --git a/testproject/locale/zh_Hans/LC_MESSAGES/django.po b/testproject/locale/zh_Hans/LC_MESSAGES/django.po new file mode 100644 index 0000000..5d9c151 --- /dev/null +++ b/testproject/locale/zh_Hans/LC_MESSAGES/django.po @@ -0,0 +1,34 @@ +# 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 , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-09-14 02:28-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: templates/test.html:3 +msgid "Some text to translate" +msgstr "" + +#: templates/test.html:5 +#, python-format +msgid "" +"\n" +"one bottle of beer on the wall\n" +msgid_plural "" +"\n" +"%(num_bottles)s bottles of beer on the wall\n" +msgstr[0] "" +msgstr[1] "" diff --git a/testproject/settings.py b/testproject/settings.py index c9514ba..6511996 100644 --- a/testproject/settings.py +++ b/testproject/settings.py @@ -60,11 +60,13 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.messages.middleware.MessageMiddleware' ) +# Note: languages are overridden in the test runner LANGUAGES = ( ('bs-Cyrl-BA', u'Bosnian (Cyrillic) (Bosnia and Herzegovina)'), ('ja', u'日本語'), ('xx', u'XXXXX'), ('fr', u'French'), + ('zh_Hans', u'Chinese (Simplified)'), ('fr_FR.utf8', u'French (France), UTF8'), )