summaryrefslogtreecommitdiff
path: root/master_strings.php
diff options
context:
space:
mode:
authorMax Kremmel <xing@synapse.plus.com>2005-12-26 12:24:49 +0000
committerMax Kremmel <xing@synapse.plus.com>2005-12-26 12:24:49 +0000
commitb389e027a72565a53bcbdabd3e18801d964d5d12 (patch)
tree75adf274f4f1fc04c611a614ebebd82ca881da7e /master_strings.php
parent205e4172f28916dcf7d680b39e5d6f580df236f8 (diff)
downloadlanguages-b389e027a72565a53bcbdabd3e18801d964d5d12.tar.gz
languages-b389e027a72565a53bcbdabd3e18801d964d5d12.tar.bz2
languages-b389e027a72565a53bcbdabd3e18801d964d5d12.zip
merge recent changes into HEAD
Diffstat (limited to 'master_strings.php')
-rw-r--r--master_strings.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/master_strings.php b/master_strings.php
index 06e9b59..2de553d 100644
--- a/master_strings.php
+++ b/master_strings.php
@@ -2,7 +2,7 @@
/**
* @package languages
* @subpackage functions
- * @version $Header: /cvsroot/bitweaver/_bit_languages/master_strings.php,v 1.3 2005/08/07 17:39:18 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_languages/master_strings.php,v 1.4 2005/12/26 12:24:49 squareing Exp $
*/
// Copyright (c) 2005, bitweaver.org
@@ -15,7 +15,8 @@ require_once( '../bit_setup_inc.php' );
$gBitSystem->verifyPermission( 'bit_p_edit_master_strings' );
-$gBitSmarty->assign_by_ref( 'languages', $gBitLanguage->listLanguages() );
+$languages = $gBitLanguage->listLanguages();
+$gBitSmarty->assign_by_ref( 'languages', $languages );
if( !empty( $_REQUEST['change_master'] ) ) {
$newSourceHash = $gBitLanguage->getSourceHash( $_REQUEST['edit_master'] );
@@ -100,7 +101,8 @@ if( !empty( $_REQUEST['change_master'] ) ) {
$masterStrings[$_REQUEST['source_hash']]['textarea'] = TRUE;
}
$gBitSmarty->assign_by_ref( 'masterStrings', $masterStrings );
- $gBitSmarty->assign_by_ref( 'tranStrings', $gBitLanguage->getTranslatedStrings( $_REQUEST['source_hash'] ) );
+ $translate = $gBitLanguage->getTranslatedStrings( $_REQUEST['source_hash'] );
+ $gBitSmarty->assign_by_ref( 'tranStrings', $translate );
$gBitSmarty->assign( 'sourceHash', $_REQUEST['source_hash'] );
} elseif( !empty( $_REQUEST['find'] ) && !empty( $_REQUEST['search'] ) ) {
$gBitSmarty->assign_by_ref( 'masterStrings', $gBitLanguage->searchMasterStrings( $_REQUEST['find'] ) );