diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-10-22 10:15:18 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-10-22 10:15:18 +0100 |
| commit | 0461acd10dac70872002867dc77bb1c523e8feb9 (patch) | |
| tree | 88dbf5d05e6376e51a1b771cc4f15a5a06632192 | |
| parent | 3142baa9eecbc2cdeb8ca0f7a3cb9e615012856d (diff) | |
| parent | eb9b8d995d33c5f90d405c31342b08849f601570 (diff) | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | .tx/config | 9 | ||||
| -rwxr-xr-x | bin/gettext-extract | 2 | ||||
| -rw-r--r-- | locale/FixMyStreet.po | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/.tx/config b/.tx/config new file mode 100644 index 000000000..44db89d9e --- /dev/null +++ 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 index 6bae8aa36..e77cf9cb0 100755 --- 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 index 38338c113..6d526ac50 100644 --- 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 " |