From 75aa68fb20ad9f011e0f7123f7351c19171e83c2 Mon Sep 17 00:00:00 2001
From: raul
Date: Thu, 3 Jul 2014 09:32:00 -0300
Subject: [i18n]finished translation with sql, queries and translated hardcoded
 message

---
 modules/baseconfig.inc.php   | 2 +-
 modules/systemstatus.inc.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/baseconfig.inc.php b/modules/baseconfig.inc.php
index 7d586ef3..6f82caa9 100644
--- a/modules/baseconfig.inc.php
+++ b/modules/baseconfig.inc.php
@@ -75,7 +75,7 @@ class Page_BaseConfig extends Page
 		}
 		// List global config option
 		$settings = array();
-		$res = Database::simpleQuery('SELECT cat_setting.name AS category_name, setting.setting, setting.defaultvalue, setting.permissions, setting.description, tbl.value
+		$res = Database::simpleQuery('SELECT cat_setting.' . LANG . ' AS category_name, setting.setting, setting.defaultvalue, setting.permissions, setting.' . LANG . ' AS description, tbl.value
 			FROM setting
 			INNER JOIN cat_setting USING (catid)
 			LEFT JOIN setting_global AS tbl USING (setting)
diff --git a/modules/systemstatus.inc.php b/modules/systemstatus.inc.php
index 8f3d8322..8bc68d66 100644
--- a/modules/systemstatus.inc.php
+++ b/modules/systemstatus.inc.php
@@ -148,7 +148,7 @@ class Page_SystemStatus extends Page
 			'uptime' => '???'
 		);
 		if (preg_match('/^(\d+)\D/', $uptime, $out)) {
-			$data['uptime'] = floor($out[1] / 86400) . ' Tag(e), ' . floor(($out[1] % 86400) / 3600) . ' Stunde(n)'; // TODO: i18n
+			$data['uptime'] = floor($out[1] / 86400) . ' ' . Dictionary::translate('lang_days') . ', ' . floor(($out[1] % 86400) / 3600) . ' ' . Dictionary::translate('lang_hours'); // TODO: i18n
 		}
 		if (preg_match('/\bMemTotal:\s+(\d+)\s.*\bMemFree:\s+(\d+)\s.*\bBuffers:\s+(\d+)\s.*\bCached:\s+(\d+)\s.*\bSwapTotal:\s+(\d+)\s.*\bSwapFree:\s+(\d+)\s/s', $memInfo, $out)) {
 			$data['memTotal'] = Util::readableFileSize($out[1] * 1024);
-- 
cgit v1.2.3-55-g7522