ICU-10222 Reverted r33902, but updated the locale used for testing from 'ru' to ...

X-SVN-Rev: 33915

diff --git a/icu4c/source/test/intltest/tmsgfmt.cpp b/icu4c/source/test/intltest/tmsgfmt.cpp
index e2326d0f8f2757cbe8de20d709d34e391b9306a4..afba612304a02b6bdd900f1e733d048d7dc7669a 100644 (file)
--- a/icu4c/source/test/intltest/tmsgfmt.cpp
+++ b/icu4c/source/test/intltest/tmsgfmt.cpp
@@ -541,8 +541,8 @@ void TestMessageFormat::testMsgFormatPlural(/* char* par */)
     UErrorCode err = U_ZERO_ERROR;
     UnicodeString t1("{0, plural, one{C''est # fichier} other{Ce sont # fichiers}} dans la liste."); 
     UnicodeString t2("{argument, plural, one{C''est # fichier} other {Ce sont # fichiers}} dans la liste.");
-    UnicodeString t3("There {0, plural, one{is # zavod}few{are # zavoda} other{are {0, number,###.0} zavodov}} in the directory.");
-    UnicodeString t4("There {argument, plural, one{is # zavod}few{are # zavoda} other{are {argument, number,###.0} zavodov}} in the directory.");
+    UnicodeString t3("There {0, plural, one{is # zavod}few{are {0, number,###.0} zavoda} other{are # zavodov}} in the directory.");
+    UnicodeString t4("There {argument, plural, one{is # zavod}few{are {argument, number,###.0} zavoda} other{are #zavodov}} in the directory.");
     UnicodeString t5("{0, plural, one {{0, number,C''est #,##0.0# fichier}} other {Ce sont # fichiers}} dans la liste.");
     MessageFormat* mfNum = new MessageFormat(t1, Locale("fr"), err);
     if (U_FAILURE(err)) {
@@ -578,11 +578,11 @@ void TestMessageFormat::testMsgFormatPlural(/* char* par */)
     delete mfNum;
     delete mfAlpha;
 
-    MessageFormat* mfNum2 = new MessageFormat(t3, Locale("ru"), err);
+    MessageFormat* mfNum2 = new MessageFormat(t3, Locale("uk"), err);
     numResult1.remove();
     Formattable testArgs2((int32_t)4);
     mfNum2->format(&testArgs2, 1, numResult1, ignore, err);
-    MessageFormat* mfAlpha2 = new MessageFormat(t4, Locale("ru"), err);
+    MessageFormat* mfAlpha2 = new MessageFormat(t4, Locale("uk"), err);
     argNameResult.remove();
     mfAlpha2->format(argName, &testArgs2, 1, argNameResult, err);
 
@@ -596,7 +596,7 @@ void TestMessageFormat::testMsgFormatPlural(/* char* par */)
         errln("TestMessageFormat::testMsgFormatPlural #2");
         logln(UnicodeString("The results of argumentName and argumentIndex are not the same."));
     }
-    if ( numResult1 != UnicodeString("There are 4,0 zavodov in the directory.")) {
+    if ( numResult1 != UnicodeString("There are 4,0 zavoda in the directory.")) {
         errln("TestMessageFormat::testMsgFormatPlural #2");
         logln(UnicodeString("The results of argumentName and argumentIndex are not the same."));
     }