From f6ae0519c583e86547d67b85c8542540be99801f Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Fri, 6 Oct 2006 21:52:16 +0000 Subject: [PATCH] Fixes to get multi-language at least a little working. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2075 b72ed6b6-b9f8-46b5-92b4-906544132732 --- admin/html.php | 11 +++++------ admin/install/create-mysql.sql | 9 +++++---- admin/install/upgrade-mysql.php | 12 ++++++++---- common.php | 19 ++++++++++--------- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/admin/html.php b/admin/html.php index 4ce261a6fd1..30ecc8d1820 100644 --- a/admin/html.php +++ b/admin/html.php @@ -286,7 +286,7 @@ $sumquery3 = "SELECT * FROM {$dbprefix}questions WHERE sid=$surveyid"; //Getting a count of questions for this survey $sumresult3 = $connect->Execute($sumquery3); $sumcount3 = $sumresult3->RecordCount(); - $sumquery2 = "SELECT * FROM ".db_table_name('groups')." WHERE sid=$surveyid AND language='".$defaultlang."'"; //Getting a count of groups for this survey + $sumquery2 = "SELECT * FROM ".db_table_name('groups')." WHERE sid=$surveyid AND language='".$defaultlang."'"; //Getting a count of groups for this survey $sumresult2 = $connect->Execute($sumquery2); $sumcount2 = $sumresult2->RecordCount(); $sumquery1 = "SELECT * FROM ".db_table_name('surveys')." WHERE sid=$surveyid LIMIT 1"; //Getting data for this survey @@ -424,7 +424,7 @@ $surveysummary .= "\t\t\t\t\t\n"; } - if($activated!="Y" && getGroupSum($surveyid)>1 && $sumrows5['define_questions']) + if($activated!="Y" && getGroupSum($surveyid,$s1row['language'])>1 && $sumrows5['define_questions']) { $surveysummary .= "\n" . "\t\t$setfont {$s1row['template']}\n" . "\t$setfont" - . _("Language:")."\n"; + . _("Base Language:")."\n"; if (!$s1row['language']) {$language=getLanguageNameFromCode($currentadminlang);} else {$language=getLanguageNameFromCode($s1row['language']);} $surveysummary .= "\t$setfont$language\n"; $surveysummary .= "\t$setfont" -// . _("Available_languages:")."\n"; - . "Available_languages: \n"; + . _("Additional Languages:")."\n"; if (!$s1row['available_languages']) {$available_languages=$defaultlang;} else {$available_languages=$s1row['available_languages'];} $surveysummary .= "\t$setfont$available_languages\n"; @@ -1253,7 +1252,7 @@ } else { - $loginsummary = $loginfailed . "

"._("You have to login first.")."

+ $loginsummary = "
"._("You have to login first.")."

diff --git a/admin/install/create-mysql.sql b/admin/install/create-mysql.sql index 1283be484f4..cc036c03859 100644 --- a/admin/install/create-mysql.sql +++ b/admin/install/create-mysql.sql @@ -22,7 +22,7 @@ CREATE TABLE `prefix_answers` ( `answer` text NOT NULL, `default_value` char(1) NOT NULL default 'N', `sortorder` varchar(5) default NULL, - `answer_language` varchar(20) default 'en', + `language` varchar(20) default 'en', PRIMARY KEY (`qid`,`code`) ) TYPE=MyISAM; @@ -73,7 +73,7 @@ CREATE TABLE `prefix_groups` ( `group_code` varchar(50) NOT NULL default '', `group_order` int(11) NOT NULL default '0', `description` text, - `group_language` varchar(20) default 'en', + `language` varchar(20) default 'en', PRIMARY KEY (`gid`) ) TYPE=MyISAM AUTO_INCREMENT=1 ; @@ -88,7 +88,7 @@ CREATE TABLE `prefix_labels` ( `code` varchar(5) NOT NULL default '', `title` varchar(100) NOT NULL default '', `sortorder` varchar(5) default NULL, - `label_language` varchar(20) default 'en', + `language` varchar(20) default 'en', PRIMARY KEY (`lid`,`code`) ) TYPE=MyISAM; @@ -137,7 +137,7 @@ CREATE TABLE `prefix_questions` ( `mandatory` char(1) default NULL, `lid` int(11) NOT NULL default '0', `question_order` int(11) NOT NULL, - `question_language` varchar(20) default 'en', + `language` varchar(20) default 'en', PRIMARY KEY (`qid`) ) TYPE=MyISAM AUTO_INCREMENT=1 ; @@ -186,6 +186,7 @@ CREATE TABLE `prefix_surveys` ( `url` varchar(255) default NULL, `urldescrip` varchar(255) default NULL, `language` varchar(50) default NULL, + `available_languages` varchar(255) default NULL, `datestamp` char(1) default 'N', `usecookie` char(1) default 'N', `notification` char(1) default '0', diff --git a/admin/install/upgrade-mysql.php b/admin/install/upgrade-mysql.php index 91256f44fdc..6cf35898086 100644 --- a/admin/install/upgrade-mysql.php +++ b/admin/install/upgrade-mysql.php @@ -9,13 +9,17 @@ function db_upgrade($oldversion) { /// older versions to match current functionality if ($oldversion < 109) { - modify_database("","ALTER TABLE `prefix_answers` ADD `answer_language` varchar(20) default 'en'"); - modify_database("","ALTER TABLE `prefix_questions` ADD `question_language` varchar(20) default 'en'"); - modify_database("","ALTER TABLE `prefix_groups` ADD `group_language` varchar(20) default 'en'"); - modify_database("","ALTER TABLE `prefix_labels` ADD `label_language` varchar(20) default 'en'"); + modify_database("","ALTER TABLE `prefix_answers` ADD `language` varchar(20) default 'en'"); + modify_database("","ALTER TABLE `prefix_questions` ADD `language` varchar(20) default 'en'"); + modify_database("","ALTER TABLE `prefix_groups` ADD `language` varchar(20) default 'en'"); + modify_database("","ALTER TABLE `prefix_labels` ADD `language` varchar(20) default 'en'"); modify_database("","UPDATE `prefix_settings_global` SET stg_value='109' where stg_name ='DBVersion'"); } + if ($oldversion < 110) { + modify_database("","ALTER TABLE `prefix_surveys` ADD `available_languages` varchar(255)"); + } + return true; } diff --git a/common.php b/common.php index eb5b7050e14..2671d592883 100644 --- a/common.php +++ b/common.php @@ -201,12 +201,6 @@ function showadminmenu() $adminmenu .= "\t\t\t\t\t\n" . "\t\t\t\t\t\n"; - $adminmenu .= "\t\t\t\t\t" . - ""._("Logout").""; - // edit users $adminmenu .= "\t\t\t\t\t" . "" - . "\t\t\t\t\t\n" + . "\t\t\t\t\t" + . ""._("Logout")."" . "\t\t\t\t\t\n"; if($_SESSION['USER_RIGHT_CREATE_SURVEY'] == 1) @@ -340,6 +338,9 @@ function showadminmenu() . "

"._("Username")."

\n"; return $adminmenu; } + + + //DATA TYPES $qtypeselect = getqtypelist(); @@ -458,10 +459,10 @@ function getquestions() return $questionselecter; } -function getGroupSum($surveyid) +function getGroupSum($surveyid, $lang) { global $surveyid,$dbprefix ; - $sumquery3 = "SELECT * FROM ".db_table_name('groups')." WHERE sid=$surveyid AND language='".$_SESSION['s_lang']."'"; //Getting a count of questions for this survey + $sumquery3 = "SELECT * FROM ".db_table_name('groups')." WHERE sid=$surveyid AND language='".$lang."'"; //Getting a count of questions for this survey $sumresult3 = db_execute_assoc($sumquery3); $groupscount = $sumresult3->RecordCount();