From 2c3c8f63c36afaa47f94492215fa87989484a004 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Fri, 19 Nov 2010 10:05:23 +0100
Subject: [PATCH] Add script translation test data for plural forms

---
 tests/auto/qscriptengine/translatable.js           |    3 +++
 .../qscriptengine/translations/translatable_la.qm  |  Bin 678 -> 975 bytes
 .../qscriptengine/translations/translatable_la.ts  |   16 ++++++++++++++++
 tests/auto/qscriptengine/tst_qscriptengine.cpp     |   11 +++++++++++
 4 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/tests/auto/qscriptengine/translatable.js b/tests/auto/qscriptengine/translatable.js
index 30e139a..c0d7ed0 100644
--- a/tests/auto/qscriptengine/translatable.js
+++ b/tests/auto/qscriptengine/translatable.js
@@ -7,3 +7,6 @@ var greeting_strings = [
 ];

 qsTr("One", "not the same one");
+
+qsTr("%n message(s) saved", "", 10);
+qsTranslate("FooContext", "%n fooish bar(s) found", "", "UnicodeUTF8", 10);
diff --git a/tests/auto/qscriptengine/translations/translatable_la.qm b/tests/auto/qscriptengine/translations/translatable_la.qm
index 703d0f1edd9f0a2ae4c2421c9779db7762b58e43..d76b1cad5fc50276b0f006ff84e541b150c9582c 100644
GIT binary patch
delta 383
zcmZ3+dY*lPNOl4PLzpWA1Ct;FL-c(H21Y9emTQL?7#Lg`{0{2_`41VQeryHGUt{Qf
zcLgY3z^eFhDgy&EGn-1ZA&}3&el_$dP~MV{`FsjceF9(VN}zg14!*1XKzXL>OrT;v
zW}rf`$rl+#C$>b@>oBM?<S{5Pq%q_JVIo5|LkUABLpo3-3CJq~%aj6D<T0c&lz?;^
z;n0u@*OH2^jRWK~Hju5Vc?xOy`I*HT3Q37Y8pWClylMHRc`58bIWD*S{E3%RvX!9b
z=K?LvVMqZwCJ*eK9H4X3fhI$pp@vl%#A+m^aI1xZR_CS`7bm8tg6u6$EK5z99Ka~H
J*^IG(5dhR-P_O_1

delta 105
zcmX@lzKnH(NLT;^LzpWA1H%snhUoi1dJzN5wL?JKmBH_@K9D}a5cOj#0|Vn;R>hA~
zf%Gdjm1sktI0O6D(5FDY0$=J%pgcnX-_?GgIAc;K0|S%k#Hy0XZHy6{<CzK=0kSe1
A$^ZZW

diff --git a/tests/auto/qscriptengine/translations/translatable_la.ts b/tests/auto/qscriptengine/translations/translatable_la.ts
index 1598f39..36271c9 100644
--- a/tests/auto/qscriptengine/translations/translatable_la.ts
+++ b/tests/auto/qscriptengine/translations/translatable_la.ts
@@ -26,6 +26,14 @@
         <source>Goodbye</source>
         <translation>Farvel</translation>
     </message>
+    <message numerus="yes">
+        <location filename="translatable.js" line="12"/>
+        <source>%n fooish bar(s) found</source>
+        <translation>
+            <numerusform>%n fooaktig bar funnet</numerusform>
+            <numerusform>%n fooaktige barer funnet</numerusform>
+        </translation>
+    </message>
 </context>
 <context>
     <name>translatable</name>
@@ -45,6 +53,14 @@
         <comment>not the same one</comment>
         <translation>Enda en</translation>
     </message>
+    <message numerus="yes">
+        <location filename="translatable.js" line="11"/>
+        <source>%n message(s) saved</source>
+        <translation>
+            <numerusform>%n melding lagret</numerusform>
+            <numerusform>%n meldinger lagret</numerusform>
+        </translation>
+    </message>
     <message>
         <source>Goodbye</source>
         <translation type="obsolete">Farvel</translation>
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 757ec14..2fe7a2d 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -4772,6 +4772,11 @@ void tst_QScriptEngine::translateScript_data()
             << QString::fromLatin1("eval('qsTr(\\'One\\')')") << fileName << QString::fromLatin1("En");
     QTest::newRow("eval('qsTr(\\'Hello\\')')@translatable.js")
             << QString::fromLatin1("eval('qsTr(\\'Hello\\')')") << fileName << QString::fromLatin1("Hallo");
+    // Plural
+    QTest::newRow("qsTr('%n message(s) saved', '', 1)@translatable.js")
+            << QString::fromLatin1("qsTr('%n message(s) saved', '', 1)") << fileName << QString::fromLatin1("1 melding lagret");
+    QTest::newRow("qsTr('%n message(s) saved', '', 3).arg@translatable.js")
+            << QString::fromLatin1("qsTr('%n message(s) saved', '', 3)") << fileName << QString::fromLatin1("3 meldinger lagret");

     // Top-level
     QTest::newRow("qsTranslate('FooContext', 'Two')@translatable.js")
@@ -4798,6 +4803,12 @@ void tst_QScriptEngine::translateScript_data()
     QTest::newRow("qsTr('One', 'not the same one', 42)@translatable.js")
             << QString::fromLatin1("qsTr('One', 'not the same one', 42)") << fileName << QString::fromLatin1("One");

+    // Plural
+    QTest::newRow("qsTranslate('FooContext', '%n fooish bar(s) found', '', 'UnicodeUTF8', 1)@translatable.js")
+            << QString::fromLatin1("qsTranslate('FooContext', '%n fooish bar(s) found', '', 'UnicodeUTF8', 1)") << fileName << QString::fromLatin1("1 fooaktig bar funnet");
+    QTest::newRow("qsTranslate('FooContext', '%n fooish bar(s) found', '', 'UnicodeUTF8', 2)@translatable.js")
+            << QString::fromLatin1("qsTranslate('FooContext', '%n fooish bar(s) found', '', 'UnicodeUTF8', 2)") << fileName << QString::fromLatin1("2 fooaktige barer funnet");
+
     // Don't exist in translation
     QTest::newRow("qsTr('Three')@translatable.js")
             << QString::fromLatin1("qsTr('Three')") << fileName << QString::fromLatin1("Three");
--
1.7.3