[geeklog-cvs] tools/lm README, 1.1.1.1, 1.2 lm.php, 1.1.1.1, 1.2 mblm.php, 1.1.1.1, 1.2 uplng.sh, 1.1.1.1, 1.2
Dirk Haun
dhaun at qs1489.pair.com
Fri Mar 21 16:26:07 EDT 2008
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/language german.php, 1.186, 1.187 german_formal.php, 1.91, 1.92 german_formal_utf-8.php, 1.44, 1.45 german_utf-8.php, 1.75, 1.76
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.34, 1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/geeklog/tools/lm
In directory qs1489.pair.com:/tmp/cvs-serv55246
Modified Files:
README lm.php mblm.php uplng.sh
Log Message:
Updated for Geeklog 1.5 (main language files only, though)
Index: README
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/README,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README 5 Jun 2007 10:48:01 -0000 1.1.1.1
--- README 21 Mar 2008 20:26:05 -0000 1.2
***************
*** 1,3 ****
! lm.php v0.6
These little scripts merge a Geeklog (foreign) language file with the
--- 1,3 ----
! lm.php v0.7
These little scripts merge a Geeklog (foreign) language file with the
***************
*** 37,48 ****
when a new version of Geeklog is about to be released.
! You can subscribe to the Geeklog mailing lists at
!
! http://lists.geeklog.net/mailman/listinfo/
! lm.php was originally written for Geeklog 1.3.9. It should work just fine
! with language files from older versions, though.
! Copyright (C) 2004-2006 by Dirk Haun, <dirk AT haun-online DOT de>,
and released under the GNU General Public License v2.
--- 37,45 ----
when a new version of Geeklog is about to be released.
! You can subscribe to the geeklog-translations mailing list at
! http://lists.geeklog.net/mailman/listinfo/geeklog-translations
! Copyright (C) 2004-2008 by Dirk Haun, <dirk AT haun-online DOT de>,
and released under the GNU General Public License v2.
***************
*** 55,57 ****
0.5 updated for Geeklog 1.4.0
0.6 updated for Geeklog 1.4.1
!
--- 52,54 ----
0.5 updated for Geeklog 1.4.0
0.6 updated for Geeklog 1.4.1
! 0.7 updated for Geeklog 1.5.0
Index: lm.php
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/lm.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** lm.php 5 Jun 2007 10:48:00 -0000 1.1.1.1
--- lm.php 21 Mar 2008 20:26:05 -0000 1.2
***************
*** 4,8 ****
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
! // | Geeklog 1.4 |
// +---------------------------------------------------------------------------+
// | lm.php |
--- 4,8 ----
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
! // | Geeklog 1.5 |
// +---------------------------------------------------------------------------+
// | lm.php |
***************
*** 10,14 ****
// | Update a language file by merging it with english.php |
// +---------------------------------------------------------------------------+
! // | Copyright (C) 2004-2006 by the following authors: |
// | |
// | Author: Dirk Haun - dirk AT haun-online DOT de |
--- 10,14 ----
// | Update a language file by merging it with english.php |
// +---------------------------------------------------------------------------+
! // | Copyright (C) 2004-2008 by the following authors: |
// | |
// | Author: Dirk Haun - dirk AT haun-online DOT de |
***************
*** 33,37 ****
// $Id$
! $VERSION = '0.6';
// Prevent PHP from reporting uninitialized variables
--- 33,37 ----
// $Id$
! $VERSION = '0.7';
// Prevent PHP from reporting uninitialized variables
***************
*** 75,78 ****
--- 75,79 ----
$ENG03 = $LANG03;
$ENG04 = $LANG04;
+ $ENGMY = $LANG_MYACCOUNT;
$ENG05 = $LANG05;
// $LANG06 moved to the Links plugin as of Geeklog 1.4.0
***************
*** 123,131 ****
$ENG_trackbackcodes = $LANG_trackbackcodes;
! unset ($LANG_MONTH);
! unset ($LANG_WEEK);
// now load the language file we want to update
! require_once ($langfile);
// try to rescue translated day and months names
--- 124,140 ----
$ENG_trackbackcodes = $LANG_trackbackcodes;
! $ENG_CONFIG = $LANG_CONFIG;
! $ENG_configsections['Core'] = $LANG_configsections['Core'];
! $ENG_confignames['Core'] = $LANG_confignames['Core'];
! $ENG_configsubgroups['Core'] = $LANG_configsubgroups['Core'];
! $ENG_configsubgroups['Core'] = $LANG_configsubgroups['Core'];
! $ENG_fs['Core'] = $LANG_fs['Core'];
! $ENG_configselects['Core'] = $LANG_configselects['Core'];
!
! unset($LANG_MONTH);
! unset($LANG_WEEK);
// now load the language file we want to update
! require_once $langfile;
// try to rescue translated day and months names
***************
*** 191,195 ****
$newtxt = str_replace ("\n", '\n', $newtxt);
! if (strpos ($newtxt, '{$') === false) {
if (strpos ($newtxt, '\n') === false) {
// text contains neither variables nor line feeds,
--- 200,226 ----
$newtxt = str_replace ("\n", '\n', $newtxt);
! if (is_array($newtxt)) { // mainly for the config selects
! $quotedtext = 'array(';
! foreach ($newtxt as $nkey => $ntxt) {
! $quotedtext .= "'" . str_replace("'", "\'", $nkey) . "' => ";
! if ($ntxt === true) {
! $quotedtext .= 'true';
! } else if ($ntxt === false) {
! $quotedtext .= 'false';
! } else if (is_numeric($ntxt)) {
! $quotedtext .= $ntxt;
! } else {
! $quotedtext .= "'" . str_replace("'", "\'", $ntxt) . "'";
! }
! $quotedtext .= ', ';
! }
! $quotedtext = substr($quotedtext, 0, -2);
! $quotedtext .= ')';
!
! // hack for this special case ...
! if ($quotedtext == "array('True' => 1, 'False' => '')") {
! $quotedtext = "array('True' => TRUE, 'False' => FALSE)";
! }
! } else if (strpos ($newtxt, '{$') === false) {
if (strpos ($newtxt, '\n') === false) {
// text contains neither variables nor line feeds,
***************
*** 294,297 ****
--- 325,329 ----
mergeArrays($ENG03, $LANG03, 'LANG03', 'comment.php');
mergeArrays($ENG04, $LANG04, 'LANG04', 'users.php');
+ mergeArrays($ENGMY, $LANG_MYACCOUNT, 'LANG_MYACCOUNT', "Customize if need to modify the Tabbed navbar MyAccount panels used.\nArray index key matches preference div id");
mergeArrays($ENG05, $LANG05, 'LANG05', 'index.php');
mergeArrays($ENG08, $LANG08, 'LANG08', 'profiles.php');
***************
*** 339,342 ****
--- 371,383 ----
mergeArrays($ENG_sortcodes, $LANG_sortcodes, 'LANG_sortcodes', false);
mergeArrays($ENG_trackbackcodes, $LANG_trackbackcodes, 'LANG_trackbackcodes', false);
+
+ echo "\n";
+
+ mergeArrays($ENG_CONFIG, $LANG_CONFIG, 'LANG_CONFIG', 'Localization of the Admin Configuration UI');
+ mergeArrays($ENG_configsections['Core'], $LANG_configsections['Core'], "LANG_configsections['Core']", false);
+ mergeArrays($ENG_confignames['Core'], $LANG_confignames['Core'], "LANG_confignames['Core']", false);
+ mergeArrays($ENG_configsubgroups['Core'], $LANG_configsubgroups['Core'], "LANG_configsubgroups['Core']", false);
+ mergeArrays($ENG_fs['Core'], $LANG_fs['Core'], "LANG_fs['Core']", false);
+ mergeArrays($ENG_configselects['Core'], $LANG_configselects['Core'], "LANG_configselects['Core']", false);
echo "\n?>";
Index: uplng.sh
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/uplng.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** uplng.sh 5 Jun 2007 10:48:01 -0000 1.1.1.1
--- uplng.sh 21 Mar 2008 20:26:05 -0000 1.2
***************
*** 1,5 ****
#!/bin/bash
# +---------------------------------------------------------------------------+
! # | Geeklog 1.4 |
# +---------------------------------------------------------------------------+
# | uplng.sh |
--- 1,5 ----
#!/bin/bash
# +---------------------------------------------------------------------------+
! # | Geeklog 1.5 |
# +---------------------------------------------------------------------------+
# | uplng.sh |
***************
*** 8,12 ****
# | mblm.php scripts. |
# +---------------------------------------------------------------------------+
! # | Copyright (C) 2004-2006 by the following authors: |
# | |
# | Author: Dirk Haun - dirk AT haun-online DOT de |
--- 8,12 ----
# | mblm.php scripts. |
# +---------------------------------------------------------------------------+
! # | Copyright (C) 2004-2008 by the following authors: |
# | |
# | Author: Dirk Haun - dirk AT haun-online DOT de |
***************
*** 47,52 ****
# paths to the lm.php and mblm.php scripts
! lm=$basedir/local-cvs/tools/lm/lm.php
! mblm=$basedir/local-cvs/tools/lm/mblm.php
--- 47,52 ----
# paths to the lm.php and mblm.php scripts
! lm=$basedir/cvs.geeklog.net/tools/lm/lm.php
! mblm=$basedir/cvs.geeklog.net/tools/lm/mblm.php
***************
*** 63,67 ****
cd $destpath
for l in $files; do
! utf=`grep -i utf-8 $langpath/$l`
if [ -z "$utf" ]; then
echo "$l"
--- 63,67 ----
cd $destpath
for l in $files; do
! utf=`grep -i 'LANG_CHARSET.*utf-8' $langpath/$l`
if [ -z "$utf" ]; then
echo "$l"
Index: mblm.php
===================================================================
RCS file: /cvsroot/geeklog/tools/lm/mblm.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mblm.php 5 Jun 2007 10:48:01 -0000 1.1.1.1
--- mblm.php 21 Mar 2008 20:26:05 -0000 1.2
***************
*** 4,8 ****
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
! // | Geeklog 1.4 |
// +---------------------------------------------------------------------------+
// | mblm.php |
--- 4,8 ----
/* Reminder: always indent with 4 spaces (no tabs). */
// +---------------------------------------------------------------------------+
! // | Geeklog 1.5 |
// +---------------------------------------------------------------------------+
// | mblm.php |
***************
*** 11,15 ****
// | version of lm.php - requires PHP built with --enable-mbstring option. |
// +---------------------------------------------------------------------------+
! // | Copyright (C) 2004-2006 by the following authors: |
// | |
// | Author: Dirk Haun - dirk AT haun-online DOT de |
--- 11,15 ----
// | version of lm.php - requires PHP built with --enable-mbstring option. |
// +---------------------------------------------------------------------------+
! // | Copyright (C) 2004-2008 by the following authors: |
// | |
// | Author: Dirk Haun - dirk AT haun-online DOT de |
***************
*** 34,38 ****
// $Id$
! $VERSION = '0.6';
// Prevent PHP from reporting uninitialized variables
--- 34,38 ----
// $Id$
! $VERSION = '0.7';
// Prevent PHP from reporting uninitialized variables
***************
*** 86,89 ****
--- 86,90 ----
$ENG03 = $LANG03;
$ENG04 = $LANG04;
+ $ENGMY = $LANG_MYACCOUNT;
$ENG05 = $LANG05;
// $LANG06 moved to the Links plugin as of Geeklog 1.4.0
***************
*** 134,142 ****
$ENG_trackbackcodes = $LANG_trackbackcodes;
! unset ($LANG_MONTH);
! unset ($LANG_WEEK);
// now load the language file we want to update
! require_once ($langfile);
// try to rescue translated day and months names
--- 135,151 ----
$ENG_trackbackcodes = $LANG_trackbackcodes;
! $ENG_CONFIG = $LANG_CONFIG;
! $ENG_configsections['Core'] = $LANG_configsections['Core'];
! $ENG_confignames['Core'] = $LANG_confignames['Core'];
! $ENG_configsubgroups['Core'] = $LANG_configsubgroups['Core'];
! $ENG_configsubgroups['Core'] = $LANG_configsubgroups['Core'];
! $ENG_fs['Core'] = $LANG_fs['Core'];
! $ENG_configselects['Core'] = $LANG_configselects['Core'];
!
! unset($LANG_MONTH);
! unset($LANG_WEEK);
// now load the language file we want to update
! require_once $langfile;
// try to rescue translated day and months names
***************
*** 200,206 ****
}
! $newtxt = mb_ereg_replace ("\n", '\n', $newtxt);
! if (mb_strpos ($newtxt, '{$') === false) {
if (mb_strpos ($newtxt, '\n') === false) {
// text contains neither variables nor line feeds,
--- 209,241 ----
}
! if (!is_array($newtxt)) {
! $newtxt = mb_ereg_replace("\n", '\n', $newtxt);
! }
! if (is_array($newtxt)) { // mainly for the config selects
! $quotedtext = 'array(';
! foreach ($newtxt as $nkey => $ntxt) {
! $quotedtext .= "'" . str_replace("'", "\'", $nkey) . "' => ";
! if ($ntxt === true) {
! $quotedtext .= 'true';
! } else if ($ntxt === false) {
! $quotedtext .= 'false';
! } else if (is_numeric($ntxt)) {
! $quotedtext .= $ntxt;
! } else {
! $quotedtext .= "'" . str_replace("'", "\'", $ntxt) . "'";
! }
! $quotedtext .= ', ';
! }
! $quotedtext = substr($quotedtext, 0, -2);
! $quotedtext .= ')';
!
! // hack for this special case ...
! if ($quotedtext == "array('True' => 1, 'False' => '')") {
! $quotedtext = "array('True' => TRUE, 'False' => FALSE)";
! }
!
! $quotedtext = mb_ereg_replace("\n", '\n', $quotedtext);
! } else if (mb_strpos ($newtxt, '{$') === false) {
if (mb_strpos ($newtxt, '\n') === false) {
// text contains neither variables nor line feeds,
***************
*** 306,309 ****
--- 341,345 ----
mergeArrays($ENG03, $LANG03, 'LANG03', 'comment.php');
mergeArrays($ENG04, $LANG04, 'LANG04', 'users.php');
+ mergeArrays($ENGMY, $LANG_MYACCOUNT, 'LANG_MYACCOUNT', "Customize if need to modify the Tabbed navbar MyAccount panels used.\nArray index key matches preference div id");
mergeArrays($ENG05, $LANG05, 'LANG05', 'index.php');
mergeArrays($ENG08, $LANG08, 'LANG08', 'profiles.php');
***************
*** 351,354 ****
--- 387,399 ----
mergeArrays($ENG_sortcodes, $LANG_sortcodes, 'LANG_sortcodes', false);
mergeArrays($ENG_trackbackcodes, $LANG_trackbackcodes, 'LANG_trackbackcodes', false);
+
+ echo "\n";
+
+ mergeArrays($ENG_CONFIG, $LANG_CONFIG, 'LANG_CONFIG', 'Localization of the Admin Configuration UI');
+ mergeArrays($ENG_configsections['Core'], $LANG_configsections['Core'], "LANG_configsections['Core']", false);
+ mergeArrays($ENG_confignames['Core'], $LANG_confignames['Core'], "LANG_confignames['Core']", false);
+ mergeArrays($ENG_configsubgroups['Core'], $LANG_configsubgroups['Core'], "LANG_configsubgroups['Core']", false);
+ mergeArrays($ENG_fs['Core'], $LANG_fs['Core'], "LANG_fs['Core']", false);
+ mergeArrays($ENG_configselects['Core'], $LANG_configselects['Core'], "LANG_configselects['Core']", false);
echo "\n?>";
- Previous message (by thread): [geeklog-cvs] Geeklog-1.x/language german.php, 1.186, 1.187 german_formal.php, 1.91, 1.92 german_formal_utf-8.php, 1.44, 1.45 german_utf-8.php, 1.75, 1.76
- Next message (by thread): [geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.34, 1.35
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the geeklog-cvs
mailing list