gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 21:16:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

include language file in inc.Authentication.php instead of inc.Language.php

Browse Source 
check if language file is available
This commit is contained in:
steinm 2013-01-24 08:02:58 +00:00
parent 0cc09f6e84
commit 0b64db098f
2 changed files with 24 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
inc/inc.Authentication.php
View File

@ -46,8 +46,15 @@ $dms->setUser($user);
$notifier = new LetoDMS_Email(); $notifier = new LetoDMS_Email();
$notifier->setSender($user); $notifier->setSender($user);
/* Include the language file as specified in the session. If that is not
* available use the language from the settings
*/
if(file_exists($settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc"))
include $settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc";
else
include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc";
$theme = $resArr["theme"]; $theme = $resArr["theme"];
include $settings->_rootDir . "languages/" . $resArr["language"] . "/lang.inc";
if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $resArr["language"] . "/lang.inc")) { if(file_exists($settings->_rootDir . "view/".$theme."/languages/" . $resArr["language"] . "/lang.inc")) {
include $settings->_rootDir . "view/".$theme."/languages/" . $resArr["language"] . "/lang.inc"; include $settings->_rootDir . "view/".$theme."/languages/" . $resArr["language"] . "/lang.inc";
} }

55
inc/inc.Language.php
View File

@ -34,21 +34,22 @@ function getLanguages()
array_push($languages, $entry); array_push($languages, $entry);
} }
closedir($handle); closedir($handle);
asort($languages);
return $languages; return $languages;
} }
include $settings->_rootDir . "languages/" . $settings->_language . "/lang.inc"; function getMLText($key, $replace = array(), $defaulttext = "")
function getMLText($key, $replace = array())
{ {
GLOBAL $settings, $text; GLOBAL $settings, $text;
if (!isset($text[$key])) if (!isset($text[$key])) {
return "Error getting Text: " . $key . " (" . $settings->_language . ")"; if (!$defaulttext)
return "Error getting Text: " . $key . " (" . $settings->_language . ")";
$tmpText = $text[$key]; else
$tmpText = $defaulttext;
} else
$tmpText = $text[$key];
if (count($replace) == 0) if (count($replace) == 0)
return $tmpText; return $tmpText;
@ -60,9 +61,9 @@ function getMLText($key, $replace = array())
return $tmpText; return $tmpText;
} }
function printMLText($key, $replace = array()) function printMLText($key, $replace = array(), $defaulttext = "")
{ {
print getMLText($key, $replace); print getMLText($key, $replace, $defaulttext);
} }
function printReviewStatusText($status, $date=0) { function printReviewStatusText($status, $date=0) {
@ -166,34 +167,7 @@ function getApprovalStatusText($status, $date=0) {
} }
function printOverallStatusText($status) { function printOverallStatusText($status) {
if (is_null($status)) { print getOverallStatusText($status);
print getMLText("assumed_released");
}
else {
switch($status) {
case S_DRAFT_REV:
print getMLText("draft_pending_review");
break;
case S_DRAFT_APP:
print getMLText("draft_pending_approval");
break;
case S_RELEASED:
print getMLText("released");
break;
case S_REJECTED:
print getMLText("rejected");
break;
case S_OBSOLETE:
print getMLText("obsolete");
break;
case S_EXPIRED:
print getMLText("expired");
break;
default:
print getMLText("status_unknown");
break;
}
}
} }
function getOverallStatusText($status) { function getOverallStatusText($status) {
@ -202,6 +176,9 @@ function getOverallStatusText($status) {
} }
else { else {
switch($status) { switch($status) {
case S_IN_WORKFLOW:
return getMLText("in_workflow");
break;
case S_DRAFT_REV: case S_DRAFT_REV:
return getMLText("draft_pending_review"); return getMLText("draft_pending_review");
break; break;