From 24813e9621435040cbf2f04d65d5fc8c9199d3d6 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Wed, 21 Sep 2005 04:21:00 +0000
Subject: [PATCH] r393: Localizations

---
 admin/language.php | 10 +++++-----
 attachment.php     |  6 +++---
 favourite.php      |  4 ++--
 viewattachment.php |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/admin/language.php b/admin/language.php
index 6de3088..78e1f1a 100644
--- a/admin/language.php
+++ b/admin/language.php
@@ -75,7 +75,7 @@ if ($_REQUEST['do'] == 'edit')
 	$admin->table_start();
 	$admin->table_head(lang::r('Edit Language - ' . $language['title']));
 	
-	$admin->row_input(lang::r('Title'), 'title', $language['title']);
+	$admin->row_input(lang::p('title'), 'title', $language['title']);
 	$admin->row_input(lang::p('character_set'), 'charset', $language['charset']);
 	$admin->list_item(lang::p('ltr'), 'ltr', (($language['direction'] == 'ltr') ? true : false));
 	$admin->list_item(lang::p('rtl'), 'rtl', (($language['direction'] == 'rtl') ? true : false));
@@ -92,12 +92,12 @@ if ($_REQUEST['do'] == 'edit')
 
 if ($_REQUEST['do'] == 'modify')
 {
-	$admin->page_start(lang::r('Manage Languages'));
+	$admin->page_start(lang::p('manage_languages'));
 		
 	$admin->table_start();
-	$admin->table_head(lang::r('Manage Languages'), 4);
+	$admin->table_head(lang::p('manage_languages'), 4);
 	
-	$admin->table_column_head(array(lang::r('Title'), lang::r('Charset'), lang::r('Options'), lang::p('actions')));
+	$admin->table_column_head(array(lang::p('title'), lang::p('charset'), lang::p('options'), lang::p('actions')));
 	
 	$languages = $db->query("SELECT * FROM " . TABLE_PREFIX . "language ORDER BY languageid ASC");
 	while ($language = $db->fetch_array($languages))
@@ -105,7 +105,7 @@ if ($_REQUEST['do'] == 'modify')
 		$admin->row_multi_item(array(
 			$language['title'] => 'l',
 			$language['charset'] => 'c',
-			(($language['default']) ? '<strong>' . lang::p('default_language') . '</strong> / ' : '') . (($language['userselect']) ? lang::r('User Selectable') : lang::p('private')) => 'c',
+			(($language['default']) ? '<strong>' . lang::p('default_language') . '</strong> / ' : '') . (($language['userselect']) ? lang::p('user_selectable') : lang::p('private')) => 'c',
 			"<a href=\"language.php?do=edit&amp;languageid=$language[languageid]\">[" . lang::p('edit_settings') . "]</a> <a href=\"phrase.php?languageid=$language[languageid]\">[" . lang::p('manage_phrases') . "]</a>" => 'c'
 		));
 	}
diff --git a/attachment.php b/attachment.php
index 48e3768..b55f816 100755
--- a/attachment.php
+++ b/attachment.php
@@ -98,7 +98,7 @@ if ($_POST['do'] == 'insert')
 	// did it upload?
 	if (!is_uploaded_file($FILE['tmp_name']))
 	{
-		$message->error(lang::r('The file you specified did not upload.'));
+		$message->error(lang::p('error_file_not_uploaded'));
 	}
 	
 	// #*# put some MIME-type validation here
@@ -139,7 +139,7 @@ if ($_POST['do'] == 'insert')
 		
 		$log->language = 'log_mark_obsoletes';
 		$log->arguments = array($attachmentid, $FILE['name'], implode(', ', $obsoletes));
-		$log->log($log->diff(lang::r('obsoleted attachments'), '', implode(', ', $obsoletes)));
+		$log->log($log->diff(lang::p('obsoleted_attachments'), '', implode(', ', $obsoletes)));
 	}
 	
 	// handle comment stuff
@@ -173,7 +173,7 @@ if ($_POST['do'] == 'insert')
 	// update the last post data
 	$db->query("UPDATE " . TABLE_PREFIX . "bug SET lastposttime = $time, lastpostby = " . $bugsys->userinfo['userid'] . " WHERE bugid = $bug[bugid]");
 	
-	$message->redirect(lang::r('attachment added'), "showreport.php?bugid=$bug[bugid]");
+	$message->redirect(lang::p('attachment_added'), "showreport.php?bugid=$bug[bugid]");
 }
 
 // ###################################################################
diff --git a/favourite.php b/favourite.php
index 50e8e6f..d08e5ae 100644
--- a/favourite.php
+++ b/favourite.php
@@ -41,12 +41,12 @@ if ($_REQUEST['do'] == 'handle')
 	if ($db->query_first("SELECT * FROM " . TABLE_PREFIX . "favourite WHERE userid = " . $bugsys->userinfo['userid'] . " AND bugid = " . intval($bugsys->in['bugid'])))
 	{
 		$db->query("DELETE FROM " . TABLE_PREFIX . "favourite WHERE userid = " . $bugsys->userinfo['userid'] . " AND bugid = " . intval($bugsys->in['bugid']));
-		$message->redirect(lang::r('Favourite removed'), "showreport.php?bugid=" . intval($bugsys->in['bugid']));
+		$message->redirect(lang::p('favourite_removed'), "showreport.php?bugid=" . intval($bugsys->in['bugid']));
 	}
 	else
 	{
 		$db->query("INSERT INTO " . TABLE_PREFIX . "favourite (userid, bugid) VALUES (" . $bugsys->userinfo['userid'] . ", " . intval($bugsys->in['bugid']) . ")");
-		$message->redirect(lang::r('Favourite added'), "showreport.php?bugid=" . intval($bugsys->in['bugid']));
+		$message->redirect(lang::p('favourite_added'), "showreport.php?bugid=" . intval($bugsys->in['bugid']));
 	}
 }
 
diff --git a/viewattachment.php b/viewattachment.php
index 83c137c..fef08c2 100755
--- a/viewattachment.php
+++ b/viewattachment.php
@@ -21,7 +21,7 @@ require_once('./global.php');
 $attachment = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "attachment WHERE attachmentid = " . intval($bugsys->in['attachmentid']));
 if (!$attachment)
 {
-	$message->error(lang::r('error_invalid_id'));
+	$message->error(lang::p('error_invalid_id'));
 }
 
 if (!can_perform('cangetattach') AND !can_perform('caneditattach'))
-- 
2.22.5