summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/install.inc2
-rw-r--r--includes/locale.inc4
2 files changed, 3 insertions, 3 deletions
diff --git a/includes/install.inc b/includes/install.inc
index 7387f7c41..483483813 100644
--- a/includes/install.inc
+++ b/includes/install.inc
@@ -578,7 +578,7 @@ function st($string, $args = array()) {
if (!isset($locale_strings)) {
$locale_strings = array();
- $filename = './profiles/'. $profile .'/po/'. $install_locale .'.po';
+ $filename = './profiles/'. $profile .'/translations/'. $install_locale .'.po';
if (file_exists($filename)) {
require_once './includes/locale.inc';
$file = (object) array('filepath' => $filename);
diff --git a/includes/locale.inc b/includes/locale.inc
index 49677a8bc..f0aba35ea 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -2372,7 +2372,7 @@ function locale_batch_by_language($langcode, $finished = '_locale_batch_installe
// with names ending with $langcode.po. This allows for filenames
// like node-module.de.po to let translators use small files and
// be able to import in smaller chunks.
- $files = array_merge($files, file_scan_directory(dirname($component->filename) .'/po/', '(^|\.)'. $langcode .'\.po$', array('.', '..', 'CVS'), 0, FALSE));
+ $files = array_merge($files, file_scan_directory(dirname($component->filename) .'/translations/', '(^|\.)'. $langcode .'\.po$', array('.', '..', 'CVS'), 0, FALSE));
}
return _locale_batch_build($files, $finished);
@@ -2442,7 +2442,7 @@ function locale_batch_by_component($components, $finished = '_locale_batch_syste
// as $langcode.po or with names ending with $langcode.po. This allows
// for filenames like node-module.de.po to let translators use small
// files and be able to import in smaller chunks.
- $files = array_merge($files, file_scan_directory(dirname($component->filename) .'/po/', '(^|\.)('. $language_list .')\.po$', array('.', '..', 'CVS'), 0, FALSE));
+ $files = array_merge($files, file_scan_directory(dirname($component->filename) .'/translations/', '(^|\.)('. $language_list .')\.po$', array('.', '..', 'CVS'), 0, FALSE));
}
}
return _locale_batch_build($files, $finished);