summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/locale.inc2
-rw-r--r--modules/locale/locale.test3
2 files changed, 2 insertions, 3 deletions
diff --git a/includes/locale.inc b/includes/locale.inc
index 0142bdbe8..9ca99b5be 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -1298,7 +1298,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL, $group =
$current = array();
}
elseif (!empty($current["msgctxt"])) { // Already in this context? Parse error
- _locale_import_message('The translation file %filename contains an error: "msgctxt" is unexpected on line %line.', $file, lineno);
+ _locale_import_message('The translation file %filename contains an error: "msgctxt" is unexpected on line %line.', $file, $lineno);
return FALSE;
}
$line = trim(substr($line, 7));
diff --git a/modules/locale/locale.test b/modules/locale/locale.test
index 3eb7b30fb..c33322e1d 100644
--- a/modules/locale/locale.test
+++ b/modules/locale/locale.test
@@ -689,7 +689,7 @@ class LocaleImportFunctionalTest extends DrupalWebTestCase {
));
$this->assertIdentical(t('May', array(), array('langcode' => 'hr', 'context' => 'Long month name')), 'Svibanj', t('Long month name context is working.'));
- $this->assertIdentical(t('May', array(), array('langcode' => 'hr', 'context' => 'Short month name')), 'Svi.', t('Short month name context is working.'));
+ $this->assertIdentical(t('May', array(), array('langcode' => 'hr')), 'Svi.', t('Default context is working.'));
}
/**
@@ -810,7 +810,6 @@ msgctxt "Long month name"
msgid "May"
msgstr "Svibanj"
-msgctxt "Short month name"
msgid "May"
msgstr "Svi."
EOF;