Merge remote-tracking branch 'origin/master'

mysociety · Oct 22, 2012 · 0461acd · 0461acd
2 parents 3142baa + eb9b8d9
commit 0461acd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.tx/config b/.tx/config
@@ -0,0 +1,9 @@
+[main]
+host = https://www.transifex.com
+type = PO
+
+[fixmystreet.master]
+file_filter = locale/<lang>.UTF-8/LC_MESSAGES/FixMyStreet.po
+source_file = locale/FixMyStreet.po
+source_lang = en
+
diff --git a/bin/gettext-extract b/bin/gettext-extract
@@ -46,7 +46,7 @@ cat $PO | sed "
         s/POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE/POT-Creation-Date: $NOW/;
         s/LL@li.org/team@fixmystreet.com/;
         s/charset=CHARSET/charset=UTF-8/;
-        s/8bit/8bit\\\n\"\\$nl\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;/;
+        s/8bit/8bit\\\n\"\\$nl\"Plural-Forms: nplurals=2; plural=n != 1;/;
 " >> $TEMP
 mv $TEMP $PO
 

diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
@@ -15,7 +15,7 @@ msgstr ""
 "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"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: perllib/FixMyStreet/DB/Result/Problem.pm:563 perllib/FixMyStreet/DB/ResultSet/Problem.pm:339
 msgid " and "