Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #522176 by espie, mikey_p: improved the error message that one gets when importing a translation file fails.

merge-requests/26/head
Dries Buytaert 2009-07-30 08:40:22 +00:00
parent 365c421d1b
commit cee4af4b43
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
includes/locale.inc
View File

@ -1441,7 +1441,7 @@ function _locale_import_one_string($op, $value = NULL, $mode = NULL, $lang = NUL
$header = _locale_import_parse_header($value['msgstr']); $header = _locale_import_parse_header($value['msgstr']);
// Get the plural formula and update in database. // Get the plural formula and update in database.
if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filename)) { if (isset($header["Plural-Forms"]) && $p = _locale_import_parse_plural_forms($header["Plural-Forms"], $file->filepath)) {
list($nplurals, $plural) = $p; list($nplurals, $plural) = $p;
db_update('languages') db_update('languages')
->fields(array( ->fields(array(
@ -1636,13 +1636,13 @@ function _locale_import_parse_header($header) {
* *
* @param $pluralforms * @param $pluralforms
* A string containing the Plural-Forms entry * A string containing the Plural-Forms entry
* @param $filename * @param $filepath
* A string containing the filename * A string containing the filepath
* @return * @return
* An array containing the number of plurals and a * An array containing the number of plurals and a
* formula in PHP for computing the plural form * formula in PHP for computing the plural form
*/ */
function _locale_import_parse_plural_forms($pluralforms, $filename) { function _locale_import_parse_plural_forms($pluralforms, $filepath) {
// First, delete all whitespace // First, delete all whitespace
$pluralforms = strtr($pluralforms, array(" " => "", "\t" => "")); $pluralforms = strtr($pluralforms, array(" " => "", "\t" => ""));
@ -1669,7 +1669,7 @@ function _locale_import_parse_plural_forms($pluralforms, $filename) {
return array($nplurals, $plural); return array($nplurals, $plural);
} }
else { else {
drupal_set_message(t('The translation file %filename contains an error: the plural formula could not be parsed.', array('%filename' => $filename)), 'error'); drupal_set_message(t('The translation file %filepath contains an error: the plural formula could not be parsed.', array('%filepath' => $filepath)), 'error');
return FALSE; return FALSE;
} }
} }