summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-09-14 04:49:54 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-09-14 04:49:54 (GMT)
commitbd65c47b2fc238580bac319ef7c9eb579e0809b3 (patch)
tree2ef353d42439cea1a385fbb971d35918ab665c3b
parentbb26e3cfeb814dd55451e15ebbe7e2f9e9ac1137 (diff)
downloadkolab-webadmin-bd65c47b2fc238580bac319ef7c9eb579e0809b3.tar.gz
Move the locale directory into data
-rw-r--r--Makefile.am24
-rw-r--r--data/locale/de/LC_MESSAGES/messages.po (renamed from php/admin/locale/de/LC_MESSAGES/messages.po)0
-rw-r--r--data/locale/es/LC_MESSAGES/messages.po (renamed from php/admin/locale/es/LC_MESSAGES/messages.po)0
-rwxr-xr-xdata/locale/extract_messages (renamed from php/admin/locale/extract_messages)10
-rw-r--r--data/locale/fr/LC_MESSAGES/messages.po (renamed from php/admin/locale/fr/LC_MESSAGES/messages.po)0
-rw-r--r--data/locale/it/LC_MESSAGES/messages.po (renamed from php/admin/locale/it/LC_MESSAGES/messages.po)0
-rw-r--r--data/locale/nl/LC_MESSAGES/messages.po (renamed from php/admin/locale/nl/LC_MESSAGES/messages.po)0
-rw-r--r--lib/KolabAdmin/include/locale.php2
-rw-r--r--lib/KolabAdmin/include/mysmarty.php3
9 files changed, 18 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am
index 75f2fdb..1ca77eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -200,21 +200,21 @@ MSGFMT=msgfmt
@$(mkinstalldirs) `echo "$@" | sed 's|messages\.mo||'`
$(MSGFMT) -o $@ $<
-CLEANFILES += php/admin/locale/*/LC_MESSAGES/messages.mo
+CLEANFILES += data/locale/*/LC_MESSAGES/messages.mo
-PHP_LOCALE_DE_PO = php/admin/locale/de/LC_MESSAGES/messages.po
-PHP_LOCALE_DE_MO = php/admin/locale/de/LC_MESSAGES/messages.mo
-PHP_LOCALE_FR_PO = php/admin/locale/fr/LC_MESSAGES/messages.po
-PHP_LOCALE_FR_MO = php/admin/locale/fr/LC_MESSAGES/messages.mo
-PHP_LOCALE_NL_PO = php/admin/locale/nl/LC_MESSAGES/messages.po
-PHP_LOCALE_NL_MO = php/admin/locale/nl/LC_MESSAGES/messages.mo
-PHP_LOCALE_IT_PO = php/admin/locale/it/LC_MESSAGES/messages.po
-PHP_LOCALE_IT_MO = php/admin/locale/it/LC_MESSAGES/messages.mo
-PHP_LOCALE_ES_PO = php/admin/locale/es/LC_MESSAGES/messages.po
-PHP_LOCALE_ES_MO = php/admin/locale/es/LC_MESSAGES/messages.mo
+PHP_LOCALE_DE_PO = data/locale/de/LC_MESSAGES/messages.po
+PHP_LOCALE_DE_MO = data/locale/de/LC_MESSAGES/messages.mo
+PHP_LOCALE_FR_PO = data/locale/fr/LC_MESSAGES/messages.po
+PHP_LOCALE_FR_MO = data/locale/fr/LC_MESSAGES/messages.mo
+PHP_LOCALE_NL_PO = data/locale/nl/LC_MESSAGES/messages.po
+PHP_LOCALE_NL_MO = data/locale/nl/LC_MESSAGES/messages.mo
+PHP_LOCALE_IT_PO = data/locale/it/LC_MESSAGES/messages.po
+PHP_LOCALE_IT_MO = data/locale/it/LC_MESSAGES/messages.mo
+PHP_LOCALE_ES_PO = data/locale/es/LC_MESSAGES/messages.po
+PHP_LOCALE_ES_MO = data/locale/es/LC_MESSAGES/messages.mo
-localedir = $(phpkolabdir)/locale
+localedir = $(phplibdir)/data/KolabAdmin/locale
phplocalededir = $(localedir)/de/LC_MESSAGES
phplocalefrdir = $(localedir)/fr/LC_MESSAGES
diff --git a/php/admin/locale/de/LC_MESSAGES/messages.po b/data/locale/de/LC_MESSAGES/messages.po
index 64bf511..64bf511 100644
--- a/php/admin/locale/de/LC_MESSAGES/messages.po
+++ b/data/locale/de/LC_MESSAGES/messages.po
diff --git a/php/admin/locale/es/LC_MESSAGES/messages.po b/data/locale/es/LC_MESSAGES/messages.po
index 7f5aa3f..7f5aa3f 100644
--- a/php/admin/locale/es/LC_MESSAGES/messages.po
+++ b/data/locale/es/LC_MESSAGES/messages.po
diff --git a/php/admin/locale/extract_messages b/data/locale/extract_messages
index 7ca5dfb..a56bf29 100755
--- a/php/admin/locale/extract_messages
+++ b/data/locale/extract_messages
@@ -29,8 +29,8 @@ if($ARGV[0] eq "update" || $ARGV[0] eq "create") {
#print "languages : " . join(" ", @languages) . "\n";
$templatesDir = "../templates";
-$phpDir = "../../../www/admin";
-$includeDir = "../include";
+$phpDir = "../../www/admin";
+$includeDir = "../../lib/KolabAdmin/include";
#
# Extract messages from the templates
@@ -45,7 +45,7 @@ if ( $^V ge v5.8.0 ) {
print OUTFILE "<?php\n";
-@tplFiles = `find $templatesDir -name "*.tpl" -o -name "*.tpl.in" 2> /dev/null`;
+@tplFiles = `find $templatesDir -name "*.tpl" 2> /dev/null`;
foreach $tpl (@tplFiles)
{
@@ -75,9 +75,9 @@ close(OUTFILE);
#
# Get all the php files recursively in www/admin and in the includes
#
-@phpFiles = `find $phpDir -name "*.php" -o -name "*.php.in" 2> /dev/null`;
+@phpFiles = `find $phpDir -name "*.php" 2> /dev/null`;
foreach (@phpFiles) { chomp; }
-@includeFiles = `find $includeDir -name "*.php" -o -name "*.php.in" 2> /dev/null`;
+@includeFiles = `find $includeDir -name "*.php" 2> /dev/null`;
foreach (@includeFiles) { chomp; }
#print join(" ", @phpFiles);
#print join(" ", @includeFiles);
diff --git a/php/admin/locale/fr/LC_MESSAGES/messages.po b/data/locale/fr/LC_MESSAGES/messages.po
index d3a7d34..d3a7d34 100644
--- a/php/admin/locale/fr/LC_MESSAGES/messages.po
+++ b/data/locale/fr/LC_MESSAGES/messages.po
diff --git a/php/admin/locale/it/LC_MESSAGES/messages.po b/data/locale/it/LC_MESSAGES/messages.po
index 13c2c81..13c2c81 100644
--- a/php/admin/locale/it/LC_MESSAGES/messages.po
+++ b/data/locale/it/LC_MESSAGES/messages.po
diff --git a/php/admin/locale/nl/LC_MESSAGES/messages.po b/data/locale/nl/LC_MESSAGES/messages.po
index 9a0e475..9a0e475 100644
--- a/php/admin/locale/nl/LC_MESSAGES/messages.po
+++ b/data/locale/nl/LC_MESSAGES/messages.po
diff --git a/lib/KolabAdmin/include/locale.php b/lib/KolabAdmin/include/locale.php
index ce7e7fd..4172a42 100644
--- a/lib/KolabAdmin/include/locale.php
+++ b/lib/KolabAdmin/include/locale.php
@@ -108,7 +108,7 @@ setlocale(LC_ALL, $language);
$domain = "messages";
//$tmpSmarty = new MySmarty();
-bindtextdomain($domain, $locale_dir);
+bindtextdomain($domain, $locale_dir);
bind_textdomain_codeset($domain, "UTF-8");
textdomain($domain);
diff --git a/lib/KolabAdmin/include/mysmarty.php b/lib/KolabAdmin/include/mysmarty.php
index 1106869..47f5dd8 100644
--- a/lib/KolabAdmin/include/mysmarty.php
+++ b/lib/KolabAdmin/include/mysmarty.php
@@ -31,17 +31,14 @@ class MySmarty extends Smarty {
global $topdir;
global $php_dir;
global $language;
- global $basedir;
global $smarty_compiledir;
global $webserver_web_prefix;
global $params;
$this->Smarty();
- $this->config_dir = $basedir . 'configs/';
$this->template_dir = $php_dir . '/data/KolabAdmin/templates/';
$this->compile_dir = $smarty_compiledir;
- //$this->cache_dir = $basedir.'cache/';
// Added for i18n management (Romain 05-03-03)
$this->register_function("tr", "translate");