diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-10-16 01:00:23 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2004-10-16 01:00:23 +0000 |
| commit | ba2761929c4200c28ff658ecdb83158f1a9deb36 (patch) | |
| tree | 627e3e66e7c632a08790bc2590c519b0091ad402 /includes/locale.inc | |
| parent | ea17f398117dff7ff682d06b3a819518f4c98fdb (diff) | |
| download | brdo-ba2761929c4200c28ff658ecdb83158f1a9deb36.tar.gz brdo-ba2761929c4200c28ff658ecdb83158f1a9deb36.tar.bz2 | |
#7289: locale import fixes
Diffstat (limited to 'includes/locale.inc')
| -rw-r--r-- | includes/locale.inc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/includes/locale.inc b/includes/locale.inc index 5e4e19333..ec6884935 100644 --- a/includes/locale.inc +++ b/includes/locale.inc @@ -186,23 +186,19 @@ function _locale_import_po($file, $lang, $mode) { db_query("INSERT INTO {locales_target} (lid, locale, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $lang, $trans, $plid, $key); $additions++; } // translation exists - else if ($mode == 'overwrite') { //overwrite in any case - db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE locale = '%s' AND lid = %d", $trans, $lang, $lid, $plid, $key); + else if ($mode == 'overwrite' || $trans2->translation == '') { + db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE locale = '%s' AND lid = %d", $trans, $plid, $key, $lang, $lid); if ($trans2->translation == '') { $additions++; } else { $updates++; } - } // overwrite if empty string - else if ($trans2->translation == '') { - db_query("UPDATE {locales_target} SET translation = '%s', plid = %d, plural = %d WHERE locale = '%s' AND lid = %d", $trans, $lang, $lid, $plid, $key); - $additions++; } } else { // no string - db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", $comments, $english); - $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english)); + db_query("INSERT INTO {locales_source} (location, source) VALUES ('%s', '%s')", $comments, $english[$key]); + $loc = db_fetch_object(db_query("SELECT lid FROM {locales_source} WHERE source = '%s'", $english[$key])); $lid = $loc->lid; db_query("INSERT INTO {locales_target} (lid, locale, translation, plid, plural) VALUES (%d, '%s', '%s', %d, %d)", $lid, $lang, $trans, $plid, $key); if ($trans != '') { |