From 67232fe2f31dfe7a04bec5e4f1c8ec0c6ce45883 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Fri, 18 Aug 2006 03:00:21 +0000
Subject: [PATCH] r1062: Okay. Domain isn't the right word. So I'll change it
 agian.

---
 admin/language.php        | 12 ++++++------
 docs/schema_changes.sql   |  2 +-
 includes/api_language.php |  2 +-
 includes/init.php         |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/admin/language.php b/admin/language.php
index 64b1ecb..232a098 100644
--- a/admin/language.php
+++ b/admin/language.php
@@ -69,7 +69,7 @@ if ($_POST['do'] == 'insert')
 	$language->set('direction',		$bugsys->in['direction']);
 	$language->set('userselect',	$bugsys->in['userselect']);
 	$language->set('debug',			$bugsys->in['debug']);
-	$language->set('domain',		$bugsys->in['domain']);
+	$language->set('langcode',		$bugsys->in['langcode']);
 	$language->insert();
 	
 	$admin->redirect('language.php?do=modify');
@@ -89,7 +89,7 @@ if ($_REQUEST['do'] == 'add')
 	$admin->table_head(_('New Language'));
 	
 	$admin->row_input(_('Title'), 'title');
-	$admin->row_input(_('Gettext Language Domain'), 'domain');
+	$admin->row_input(_('Gettext Language Code (<em><a href="http://www.gnu.org/software/gettext/manual/html_chapter/gettext_15.html">language</a></em>_<em><a href="http://www.gnu.org/software/gettext/manual/html_chapter/gettext_16.html">COUNTRY</a></em>)'), 'langcode');
 	$admin->row_input(_('Character Set'), 'charset', 'utf-8');
 	$admin->list_item(_('Left-to-Right'), 'ltr', true);
 	$admin->list_item(_('Right-to-Left'), 'rtl');
@@ -116,7 +116,7 @@ if ($_POST['do'] == 'update')
 	$language->set('direction',		$bugsys->in['direction']);
 	$language->set('userselect',	$bugsys->in['userselect']);
 	$language->set('debug',			$bugsys->in['debug']);
-	$language->set('domain',		$bugsys->in['domain']);
+	$language->set('langcode',		$bugsys->in['langcode']);
 	$language->update();
 	
 	$admin->redirect('language.php?do=modify');
@@ -145,7 +145,7 @@ if ($_REQUEST['do'] == 'edit')
 	$admin->form_hidden_field('languageid', $language['languageid']);
 	
 	$admin->row_input(_('Title'), 'title', $language['title']);
-	$admin->row_input(_('Gettext Language Domain'), 'domain', $language['domain']);
+	$admin->row_input(_('Gettext Language Code (<em><a href="http://www.gnu.org/software/gettext/manual/html_chapter/gettext_15.html">language</a></em>_<em><a href="http://www.gnu.org/software/gettext/manual/html_chapter/gettext_16.html">COUNTRY</a></em>)'), 'langcode', $language['langcode']);
 	$admin->row_input(_('Character Set'), 'charset', $language['charset']);
 	$admin->list_item(_('Left-to-Right'), 'ltr', (($language['direction'] == 'ltr') ? true : false));
 	$admin->list_item(_('Right-to-Left'), 'rtl', (($language['direction'] == 'rtl') ? true : false));
@@ -172,14 +172,14 @@ if ($_REQUEST['do'] == 'modify')
 	$admin->table_start();
 	$admin->table_head(_('Manage Languages'), 3, 'language_manage');
 	
-	$admin->table_column_head(array(_('Title'), _('Domain / Charset'), _('Options')));
+	$admin->table_column_head(array(_('Title'), _('Language Code / Charset'), _('Options')));
 	
 	$languages = $db->query("SELECT * FROM " . TABLE_PREFIX . "language ORDER BY languageid ASC");
 	while ($language = $db->fetch_array($languages))
 	{
 		$admin->row_multi_item(array(
 			"<a href=\"language.php?do=edit&amp;languageid=$language[languageid]\">$language[title]</a>" => 'l',
-			$language['domain'] . ' / ' . $language['charset'] => 'c',
+			$language['langcode'] . ' / ' . $language['charset'] => 'c',
 			(($bugsys->options['defaultlanguage'] == $language['languageid']) ? '<strong>' . _('DEFAULT LANGUAGE') . '</strong> / ' : '') . ($language['userselect'] ? _('User Selectable') : _('Private')) => 'c'
 		));
 	}
diff --git a/docs/schema_changes.sql b/docs/schema_changes.sql
index 0ebb684..76f36ef 100644
--- a/docs/schema_changes.sql
+++ b/docs/schema_changes.sql
@@ -4,4 +4,4 @@ DROP TABLE localization;
 
 ALTER TABLE language DROP filename;
 
-ALTER TABLE language CHANGE languagecode domain VARCHAR(5) NOT NULL;
+ALTER TABLE language CHANGE languagecode langcode VARCHAR(5) NOT NULL;
diff --git a/includes/api_language.php b/includes/api_language.php
index 50a2d63..fdd72f4 100644
--- a/includes/api_language.php
+++ b/includes/api_language.php
@@ -46,7 +46,7 @@ class LanguageAPI extends API
 		'debug'			=> array(TYPE_BOOL,		REQ_NO),
 		'direction'		=> array(TYPE_STR,		REQ_NO,		':self'),
 		'userselect'	=> array(TYPE_BOOL,		REQ_NO),
-		'domain'		=> array(TYPE_STR,		REQ_YES)
+		'langcode'		=> array(TYPE_STR,		REQ_YES)
 	);
 	
 	/**
diff --git a/includes/init.php b/includes/init.php
index 1484599..8a756c4 100755
--- a/includes/init.php
+++ b/includes/init.php
@@ -130,12 +130,12 @@ require_once('./includes/language.php');
 
 $language = fetch_user_language();
 
-$stylevar['lang_domain'] = $language['domain'];
+$stylevar['lang_code'] = $language['langcode'];
 $stylevar['lang_dir'] = $language['direction'];
 $stylevar['charset'] = $language['charset'];
 
 // start gettext engine
-setlocale(LC_ALL, $language['domain']);
+setlocale(LC_ALL, $language['langcode']);
 
 bindtextdomain('Bugdar', $bugsys->sourcepath . 'locale');
 textdomain('Bugdar');
-- 
2.22.5