own3mall 8 anni fa
parent
commit
752269a472

+ 3 - 3
index.php

@@ -77,7 +77,7 @@ ogpLang();
 
 require_once("includes/view.php");
 $view = new OGPView();
-$view->setCharset( lang_charset );
+$view->setCharset( get_lang('lang_charset') );
 if(isset($_GET['type']) && $_GET['type'] == 'cleared')
 {
 	heading(true);
@@ -94,7 +94,7 @@ function heading()
 
 	global $db,$view,$settings;
 	
-	$view->setCharset( lang_charset );
+	$view->setCharset( get_lang('lang_charset') );
 	$view->setTimeZone($settings['time_zone']);
 	
 	if ( !file_exists(CONFIG_FILE) )
@@ -112,7 +112,7 @@ function heading()
 			echo "<h2>".$settings['maintenance_title']."</h2>";
 			echo "<p>".$settings['maintenance_message']."</p>";
 			$view->setTitle("OGP: Maintenance.");
-			echo "<p class='failure'>". logging_out_10 ."...</p>";
+			echo "<p class='failure'>". get_lang("logging_out_10") ."...</p>";
 			$view->refresh("index.php", 10);
 			session_destroy();
 			return;

+ 2 - 1
lang/English/modules/register.php

@@ -52,4 +52,5 @@ define('OGP_LANG_user_registration', "User Registration");
 define('OGP_LANG_your_account_details_has_been_sent_by_email_to', "Your account details has been sent by email to <b>%s</b>.");
 define('OGP_LANG_account_created', "Your account has been created.");
 define('OGP_LANG_subject', "%s :: Account Information");
-?>
+define('OGP_LANG_form', "Register");
+?>

+ 2 - 2
modules/TS3Admin/TS3Admin.php

@@ -36,9 +36,9 @@ function exec_ogp_module()
 		if( isset( $_GET['changevServer'] ) ||  !isset( $_SESSION['ts3_ip'] ))
 		{
 			if(!$isAdmin)
-			$remote_servers = $db->getRemoteServers_ts3($_SESSION['user_id']);
+				$remote_servers = $db->getRemoteServers_ts3($_SESSION['user_id']);
 			else
-			$remote_servers = $db->getRemoteServers();
+				$remote_servers = $db->getRemoteServers();
 
 			if ($remote_servers !== false) {
 				echo "<form action='home.php?m=TS3Admin' method='GET'>

+ 4 - 4
modules/server/firewall.php

@@ -181,16 +181,16 @@ function exec_ogp_module() {
 	$ft->add_field('string','get_firewall_status_command',$firewall_settings['get_firewall_status_command']);
 	$ft->add_field('string','reset_firewall_command',$firewall_settings['reset_firewall_command']);
 	$ft->end_table();
-	$ft->add_button('submit','save_firewall_settings',save_firewall_settings);
+	$ft->add_button('submit','save_firewall_settings',get_lang("save_firewall_settings"));
 	$ft->end_form();
 	
-	echo "<h3>".firewall_status."</h3>";
+	echo "<h3>".get_lang("firewall_status")."</h3>";
 	echo "<pre class='log'>";
 	echo $remote->sudo_exec($firewall_settings['get_firewall_status_command']);
 	echo "</pre>";
 	$ft = new FormTable();
 	$ft->start_form("?m=server&amp;p=firewall&amp;rhost_id=$rhost_id");
-	$ft->add_button('submit','reset_firewall',reset_firewall);
+	$ft->add_button('submit','reset_firewall',get_lang("reset_firewall"));
 	$ft->end_form();
 	echo create_back_button($_GET['m']);
-}
+}

+ 4 - 4
modules/user_games/edit_home.php

@@ -277,7 +277,7 @@ function exec_ogp_module()
 					{
 						if($remote->ftp_mgr("useradd", $current_login, $ftp_password, $home_info['home_path']) !== 0)
 						{
-							echo json_encode(array('result' => 'success', 'info' => successfully_changed_game_server));
+							echo json_encode(array('result' => 'success', 'info' => get_lang("successfully_changed_game_server")));
 							$db->logger( get_lang("successfully_changed_game_server") ." HOME ID:$home_id - ". get_lang("server_ftp_password") .":$ftp_password");
 						}
 						else
@@ -349,7 +349,7 @@ function exec_ogp_module()
 				else
 				{
 					$db->changeFtpStatus('enabled',$home_id);
-					$result = successfully_changed_game_server;
+					$result = get_lang("successfully_changed_game_server");
 					$type = "success";
 					$db->logger( get_lang("successfully_changed_game_server") ." HOME ID:$home_id - ". get_lang("change_ftp_account_status") .":enabled");
 				}
@@ -403,7 +403,7 @@ function exec_ogp_module()
 				else
 				{
 					$db->changeFtpStatus('disabled',$home_id);
-					$result = successfully_changed_game_server;
+					$result = get_lang("successfully_changed_game_server");
 					$type = "success";
 					$db->logger( get_lang("successfully_changed_game_server") ." HOME ID:$home_id - ". get_lang("change_ftp_account_status") .":disabled");
 				}
@@ -598,7 +598,7 @@ function exec_ogp_module()
 
 			if ( $db->updateGameModParams($maxplayers,$cliopts,$cpus,$nice,$home_id,$mod_cfg_id) === TRUE )
 			{
-				echo json_encode(array('result' => 'success', 'info' => successfully_modified_mod));
+				echo json_encode(array('result' => 'success', 'info' => get_lang("successfully_modified_mod")));
 				$db->logger( get_lang("successfully_modified_mod") ." [MOD CFG ID:$mod_cfg_id HOME ID:$home_id]");
 			}
 			else