diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-14 19:53:21 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-14 19:53:21 +0000 |
| commit | a16b1d92c404d7af52e2ccd3277cb8b9bd81dc59 (patch) | |
| tree | 46a6e98b418c1a303da56ae5501469d4ef5baf1c /includes | |
| parent | 3e610b85472fa06c825bc87121fac7ed44adc7d6 (diff) | |
| download | brdo-a16b1d92c404d7af52e2ccd3277cb8b9bd81dc59.tar.gz brdo-a16b1d92c404d7af52e2ccd3277cb8b9bd81dc59.tar.bz2 | |
#860154 by Zoltán Balogh, zserno, Gábor Hojtsy: Fixed Locale module does not import the plural forms from compact files.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/locale.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index 1019ba432..75e534395 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -609,7 +609,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL, $group = $context = "MSGID_PLURAL"; } elseif (!strncmp("msgid", $line, 5)) { - if ($context == "MSGSTR") { // End current entry, start a new one + if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one _locale_import_one_string($op, $current, $mode, $lang, $file, $group); $current = array(); } @@ -627,7 +627,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL, $group = $context = "MSGID"; } elseif (!strncmp("msgctxt", $line, 7)) { - if ($context == "MSGSTR") { // End current entry, start a new one + if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one _locale_import_one_string($op, $current, $mode, $lang, $file, $group); $current = array(); } |