Namespace fixes

5 files changed, 18 insertions, 14 deletions

diff --git a/edit_languages.php b/edit_languages.php
index 36eed06..3541d57 100755
--- a/edit_languages.php
+++ b/edit_languages.php
@@ -13,6 +13,7 @@
 /**
  * Initialization
  */
+use Bitweaver\KernelTools;
 require_once '../kernel/includes/setup_inc.php';
 
 $gBitSystem->verifyPermission( 'p_languages_edit' );
@@ -31,7 +32,7 @@ if( !empty( $_REQUEST['un_trans'] ) ) {
 
 if( !empty( $_REQUEST['clear_cache'] ) ) {
 	$gBitLanguage->clearCache();
-	$gBitSmarty->assign( 'saveSuccess', tra( 'System template and language cache have been cleared.' ) );
+	$gBitSmarty->assign( 'saveSuccess', KernelTools::tra( 'System template and language cache have been cleared.' ) );
 } elseif( !empty( $_REQUEST['translate'] ) ) {
 	$editLang = $_REQUEST['lang'];
 	$gBitSmarty->assign( 'lang', $editLang );
@@ -77,9 +78,9 @@ if( !empty( $_REQUEST['clear_cache'] ) ) {
 			$formHash['delete_lang_code'] = $_REQUEST['lang'];
 			$formHash['delete_language'] = true;
 			$msgHash = [
-				'label' => tra('Delete Language'),
-				'confirm_item' => tra('Are you sure you want to remove this language?') . ' ' . $languages[$_REQUEST['lang']]['native_name'],
-				'warning' => tra('This will permanently remove the languages and all translations.'),
+				'label' => KernelTools::tra('Delete Language'),
+				'confirm_item' => KernelTools::tra('Are you sure you want to remove this language?') . ' ' . $languages[$_REQUEST['lang']]['native_name'],
+				'warning' => KernelTools::tra('This will permanently remove the languages and all translations.'),
 			];
 			$gBitSystem->confirmDialog( $formHash,$msgHash );
 		}
@@ -87,7 +88,7 @@ if( !empty( $_REQUEST['clear_cache'] ) ) {
 } elseif( isset( $_REQUEST["save_language"] ) && $gBitUser->hasPermission( 'p_languages_create' ) ) {
 	if( $gBitLanguage->storeLanguage( $_REQUEST ) ) {
 		$languages = $gBitLanguage->listLanguages();
-		$gBitSmarty->assign( 'saveSuccess', tra( 'The language has been saved.' ) );
+		$gBitSmarty->assign( 'saveSuccess', KernelTools::tra( 'The language has been saved.' ) );
 		$gBitSmarty->assign( 'defaults', $_REQUEST );
 	} else {
 		$gBitSmarty->assign( 'saveErrors', $gBitLanguage->mErrors );
@@ -103,6 +104,6 @@ if( !empty( $_REQUEST['clear_cache'] ) ) {
 	$gBitSmarty->assign( 'editDescription', true );
 }
 
-$gBitSystem->display( 'bitpackage:languages/edit_languages.tpl', tra( 'Edit Languages' ) , [ 'display_mode' => 'edit' ]);
+$gBitSystem->display( 'bitpackage:languages/edit_languages.tpl', KernelTools::tra( 'Edit Languages' ) , [ 'display_mode' => 'edit' ]);
 
 ?>
diff --git a/import.php b/import.php
index b7e9796..f638226 100755
--- a/import.php
+++ b/import.php
@@ -12,6 +12,7 @@
 /**
  * Initialization
  */
+use Bitweaver\KernelTools;
 require_once '../kernel/includes/setup_inc.php';
 
 $gBitSystem->verifyPermission( 'p_languages_import' );
@@ -57,7 +58,7 @@ if (isset($_REQUEST["import"])) {
 
 	if( ($_REQUEST['overwrite'] == 'r') && !empty( $gBitLanguage->mImportConflicts ) ) {
 		unset( $impMsg['error'] );
-		$impMsg['warning'][] = tra( "Conflicts occured during language import" );
+		$impMsg['warning'][] = KernelTools::tra( "Conflicts occured during language import" );
 		$gBitSmarty->assign( 'impConflicts', $gBitLanguage->mImportConflicts );
 		$mid = 'bitpackage:languages/import_resolve.tpl';
 	}
diff --git a/liberty_plugins/data.translated.php b/liberty_plugins/data.translated.php
index 4ad6190..171575b 100755
--- a/liberty_plugins/data.translated.php
+++ b/liberty_plugins/data.translated.php
@@ -53,7 +53,7 @@ function data_translated_help() {
 	$back.= "::lang::" . KernelTools::tra(" | ::abreviation:: | __Manditory__ Is a 2 letter code that specifies the language to use. See the Abreviations given below.\n");
 	$back.= "::flag::" . KernelTools::tra(" | ::flag name:: | __Optional__ Is an image file that can be used as the link. See the Flag Names given below\n");
 //	$back.= "^__Flag Names:__ ~pp~American_Samoa / Angola / Antigua / Argentina / Armenia / Australia / Austria / Bahamas / Bahrain / Bangladesh / Barbados / Belgium / Bermuda / Bolivia / Brazil / Brunei / Canada / Cayman_Islands / Chile / China / Colombia / Cook_Islands / Costa_Rica / Croatia / Cuba / Cyprus / Czech_Republic / Denmark / Dominican_Republic / Ecuador / Egypt / El_Salvador / Estonia / Federated_States_of_Micronesia / Fiji / Finland / France / French_Polynesia / Germany / Greece / Guam / Guatemala / Haiti / Honduras / Hungary / Iceland / India / Indonesia / Iran / Iraq / Ireland / Israel / Italy / Jamaica / Japan / Jordan / Kazakstan / Kenya / Kiribati / Kuwait / Latvia / Lebanon / Lithuania / Malawi / Malaysia / Malta / Marshall_Islands / Mauritius / Mexico / Morocco / Mozambique / Nauru / Nepal / Netherlands / New_Caledonia / New_Zealand / Nicaragua / Nigeria / Niue / Norway / Pakistan / Panama / Papua_New_Guinea / Paraguay / Peru / Phillippines / Poland / Portugal / Puerto_Rico / Quatar / Romania / Russia / Samoa / Saudi_Arabia / Singapore / Slovakia / Slovenia / Solomon_Islands / Somalia / South_Africa / South_Korea / Spain / Sri_Lanka / St_Vincent_Grenadines / Surinam / Sweden / Switzerland / Taiwan / Thailand / Tonga / Trinidad_Tobago / Turkey / Tuvalu / Ukraine / United_Arab_Emirates / United_Kingdom / United_States / Uruguay / Vanuatu / Venezuela / Wales / Yugoslavia / Zambia / Zimbabwe~/pp~\n^";
-//	$back.= tra("^ __Language Abreviations:__ Chinese (Simplified)=") . "__cn__" . tra(" /  Chinese Traditional=") . "__tw__" . tra(" / Czech=") . "__cs__" . tra(" / Danish=") . "__da__" . tra(" / English=") . "__en__" . tra(" / French=") . "__fr__" . tra(" / German=") . "__de__" . tra(" / Hebrew=") . "__he__" . tra(" / Italian=") . "__it__" . tra(" / Japanese=") . "__ja__" . tra(" / Norwegian=") . "__no__" . tra(" / Polish=") . "__po__" . tra(" / Russian=") . "__ru__" . tra(" / Serbian=") . "__sr__" . tra(" / Slovak=") . "__sk__" . tra(" Spanish=") . "__es__" . tra(" Swedish=") . "__sv__.||^";
+//	$back.= KernelTools::tra("^ __Language Abreviations:__ Chinese (Simplified)=") . "__cn__" . KernelTools::tra(" /  Chinese Traditional=") . "__tw__" . KernelTools::tra(" / Czech=") . "__cs__" . KernelTools::tra(" / Danish=") . "__da__" . KernelTools::tra(" / English=") . "__en__" . KernelTools::tra(" / French=") . "__fr__" . KernelTools::tra(" / German=") . "__de__" . KernelTools::tra(" / Hebrew=") . "__he__" . KernelTools::tra(" / Italian=") . "__it__" . KernelTools::tra(" / Japanese=") . "__ja__" . KernelTools::tra(" / Norwegian=") . "__no__" . KernelTools::tra(" / Polish=") . "__po__" . KernelTools::tra(" / Russian=") . "__ru__" . KernelTools::tra(" / Serbian=") . "__sr__" . KernelTools::tra(" / Slovak=") . "__sk__" . KernelTools::tra(" Spanish=") . "__es__" . KernelTools::tra(" Swedish=") . "__sv__.||^";
 	$back.= KernelTools::tra("^__Example:__ ") . "~np~{TRANSLATED(page=>Home Page,lang=>fr,flag=>France)}~/np~^";
 	return $back;
 }
diff --git a/master_strings.php b/master_strings.php
index b4075b3..f635fc1 100755
--- a/master_strings.php
+++ b/master_strings.php
@@ -11,6 +11,7 @@
 /**
  * Initialization
  */
+use Bitweaver\KernelTools;
 require_once '../kernel/includes/setup_inc.php';
 
 $gBitSystem->verifyPermission( 'p_languages_edit_master' );
@@ -25,12 +26,12 @@ if( !empty( $_REQUEST['source_hash'] ) && !is_array( $_REQUEST['source_hash'] )
 
 if( !empty( $_REQUEST['delete_master'] ) && !empty( $_REQUEST['source_hash'] ) ) {
 	if( empty( $_REQUEST['confirm'] ) ) {
-		$gBitSystem->setBrowserTitle( tra( 'Confirm Delete' ) );
+		$gBitSystem->setBrowserTitle( KernelTools::tra( 'Confirm Delete' ) );
 		$formHash['delete_master'] = true;
 		$msgHash = [
-			'label' => tra( 'Delete Master Strings' ),
-			'warning' => tra( 'This will remove the language master string. If you are tracking translations and the string is still used, it will be inserted again, however, any translations associated with it will be lost.' ),
-			'confirm_item' => tra( "The following Master Strings will be removed" ).":",
+			'label' => KernelTools::tra( 'Delete Master Strings' ),
+			'warning' => KernelTools::tra( 'This will remove the language master string. If you are tracking translations and the string is still used, it will be inserted again, however, any translations associated with it will be lost.' ),
+			'confirm_item' => KernelTools::tra( "The following Master Strings will be removed" ).":",
 		];
 		foreach( $_REQUEST['source_hash'] as $source_hash ) {
 			$gBitLanguage->loadMasterStrings( $source_hash );
diff --git a/translate_strings.php b/translate_strings.php
index 1eb1b1c..91f23b3 100755
--- a/translate_strings.php
+++ b/translate_strings.php
@@ -13,6 +13,7 @@
 /**
  * Initialization
  */
+use Bitweaver\KernelTools;
 require_once '../kernel/includes/setup_inc.php';
 
 $gBitSystem->verifyPermission( 'p_languages_edit' );
@@ -53,7 +54,7 @@ if( isset( $_REQUEST['save_translations'] ) ) {
 	$gBitSmarty->assign('tranStrings', $tranStrings );
 	$gBitSmarty->assign( 'lang', $editLang );
 	$gBitSmarty->assign( 'translate', true );
-	$gBitSmarty->assign( 'saveSuccess', tra( "The following items have been saved successfully" ).":" );
+	$gBitSmarty->assign( 'saveSuccess', KernelTools::tra( "The following items have been saved successfully" ).":" );
 	$gBitSmarty->assign( 'storedStrings', $storedStrings );
 }
 
@@ -93,5 +94,5 @@ if( !empty( $_REQUEST['hash'] ) ) {
 	$gBitSmarty->assign( 'tranStrings', $tranStrings );
 }
 
-$gBitSystem->display( 'bitpackage:languages/translate_strings.tpl', tra( 'Edit Translations' ) , [ 'display_mode' => 'edit' ]);
+$gBitSystem->display( 'bitpackage:languages/translate_strings.tpl', KernelTools::tra( 'Edit Translations' ) , [ 'display_mode' => 'edit' ]);