summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2012-10-11 21:26:59 (GMT)
committerwebchick2012-10-11 21:26:59 (GMT)
commit2c994156c80f9e00c1e0c75cbf8c1c0f5af460a4 (patch)
treec4b08fba3bf50ec59b7c6387e84a8a1dd44814a6
parent594be7b52daac87fc8fa1f7ceaabe5dcced5943a (diff)
Issue #1808374 by SebCorbin: Fixed Wrong plural for french in locale tests.
-rw-r--r--core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php b/core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php
index f4a56e2..8119199 100644
--- a/core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php
+++ b/core/modules/locale/lib/Drupal/locale/Tests/LocalePluralFormatTest.php
@@ -74,7 +74,7 @@ class LocalePluralFormatTest extends WebTestBase {
1 => '@count hours',
),
'fr' => array(
- 0 => '1 heure',
+ 0 => '@count heure',
1 => '@count heures',
),
'hr' => array(
@@ -153,7 +153,7 @@ class LocalePluralFormatTest extends WebTestBase {
// Ensure our imported translations exist in the file.
$this->assertRaw("msgid \"Monday\"\nmsgstr \"lundi\"", t('French translations present in exported file.'));
// Check for plural export specifically.
- $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"1 heure\"\nmsgstr[1] \"@count heures\"", t('Plural translations exported properly.'));
+ $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count heure\"\nmsgstr[1] \"@count heures\"", 'Plural translations exported properly.');
// Get the Croatian translations.
$this->drupalPost('admin/config/regional/translate/export', array(
@@ -196,13 +196,13 @@ class LocalePluralFormatTest extends WebTestBase {
);
$this->drupalPost('admin/config/regional/translate/translate', $search, t('Filter'));
// Plural values for the langcode fr.
- $this->assertText('1 heure');
+ $this->assertText('@count heure');
$this->assertText('@count heures');
$this->assertNoText('2. plural form');
// Edit langcode fr translations and see if that took effect.
$edit = array(
- 'strings[10][translations][0]' => '1 heure edited',
+ 'strings[10][translations][0]' => '@count heure edited',
);
$this->drupalPost($path, $edit, t('Save translations'));
@@ -245,7 +245,7 @@ class LocalePluralFormatTest extends WebTestBase {
'langcode' => 'fr',
), t('Export'));
// Check for plural export specifically.
- $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"1 heure edited\"\nmsgstr[1] \"@count heures\"", t('Edited French plural translations for hours exported properly.'));
+ $this->assertRaw("msgid \"1 hour\"\nmsgid_plural \"@count hours\"\nmsgstr[0] \"@count heure edited\"\nmsgstr[1] \"@count heures\"", 'Edited French plural translations for hours exported properly.');
$this->assertRaw("msgid \"1 day\"\nmsgid_plural \"@count days\"\nmsgstr[0] \"1 jour\"\nmsgstr[1] \"@count jours\"", t('Added French plural translations for days exported properly.'));
// Get the Croatian translations.
@@ -288,7 +288,7 @@ msgstr ""
msgid "1 hour"
msgid_plural "@count hours"
-msgstr[0] "1 heure"
+msgstr[0] "@count heure"
msgstr[1] "@count heures"
msgid "Monday"