diff options
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/locale.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index 4c5e49d74..9929668d2 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -742,7 +742,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { $current["#"][] = substr($line, 1); } elseif (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { // End current entry, start a new one - _locale_import_one_string($op, $current, $mode, $lang); + _locale_import_one_string($op, $current, $mode, $lang, $file); $current = array(); $current["#"][] = substr($line, 1); $context = "COMMENT"; @@ -768,7 +768,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { } elseif (!strncmp("msgid", $line, 5)) { if ($context == "MSGSTR") { // End current entry, start a new one - _locale_import_one_string($op, $current, $mode, $lang); + _locale_import_one_string($op, $current, $mode, $lang, $file); $current = array(); } elseif ($context == "MSGID") { // Already in this context? Parse error @@ -842,7 +842,7 @@ function _locale_import_read_po($op, $file, $mode = NULL, $lang = NULL) { // End of PO file, flush last entry if (($context == "MSGSTR") || ($context == "MSGSTR_ARR")) { - _locale_import_one_string($op, $current, $mode, $lang); + _locale_import_one_string($op, $current, $mode, $lang, $file); } elseif ($context != "COMMENT") { _locale_import_message('The translation file %filename ended unexpectedly at line %line.', $file, $lineno); @@ -881,8 +881,10 @@ function _locale_import_message($message, $file, $lineno = NULL) { * Should existing translations be replaced ('overwrite' or 'keep') * @param $lang * Language to store the string in + * @param $file + * Object representation of file being imported, only required when op is 'db-store' */ -function _locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NULL) { +function _locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NULL, $file = NULL) { static $additions = 0; static $updates = 0; static $headerdone = FALSE; |