aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorvdigital <vdigital@piwigo.org>2006-12-25 07:17:29 +0000
committervdigital <vdigital@piwigo.org>2006-12-25 07:17:29 +0000
commit219447b9c89a27cc2bfc4193b8adc2eab7d46881 (patch)
tree86db8baf8d2a6332c9b461e812976a367c406c1e /include
parentb1a6316ca2f5f79891c6170049bfd06650847e49 (diff)
Feature Issue ID 0000527: Language localization - local.lang.php can be added to each language directory. Authorize your own translation to be keep over migrations.
git-svn-id: http://piwigo.org/svn/trunk@1679 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/common.inc.php3
-rw-r--r--include/functions.inc.php1
2 files changed, 3 insertions, 1 deletions
diff --git a/include/common.inc.php b/include/common.inc.php
index 3fca4783d..2f160a4bb 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -149,6 +149,7 @@ if (defined('IN_ADMIN') and IN_ADMIN)
{
include_once(get_language_filepath('admin.lang.php'));
}
+@include_once(get_language_filepath('local.lang.php'));
// only now we can set the localized username of the guest user (and not in
// include/user.inc.php)
@@ -243,4 +244,4 @@ if (isset($conf['header_notes']))
// default event handlers
add_event_handler('render_comment_content', 'parse_comment_content');
trigger_action('init');
-?> \ No newline at end of file
+?>
diff --git a/include/functions.inc.php b/include/functions.inc.php
index 10c5d36cd..f9fbaf88f 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -640,6 +640,7 @@ function redirect_html( $url , $msg = '', $refresh_time = 0)
{
$user = build_user( $conf['guest_id'], true);
include_once(get_language_filepath('common.lang.php'));
+ @include_once(get_language_filepath('local.lang.php'));
list($tmpl, $thm) = explode('/', $conf['default_template']);
$template = new Template(PHPWG_ROOT_PATH.'template/'.$tmpl, $thm);
}