Mibew/mibew
1
0
Fork 0
mirror of https://github.com/Mibew/mibew.git synced 2025-03-03 18:38:31 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove encoding-related localization constants

Browse Source
This commit is contained in:
Dmitriy Simushev 2014-05-14 13:01:39 +00:00
parent f483c90ee2
commit e76ded074c
5 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mibew/libs/common/response.php
View File

@ -56,11 +56,10 @@ function start_xml_output()
function start_html_output() function start_html_output()
{ {
$charset = getstring("output_charset");
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Cache-Control: no-store, no-cache, must-revalidate"); header("Cache-Control: no-store, no-cache, must-revalidate");
header("Pragma: no-cache"); header("Pragma: no-cache");
header("Content-type: text/html" . (isset($charset) ? "; charset=" . $charset : "")); header("Content-type: text/html; charset=utf-8");
} }
/** /**

3
src/mibew/locales/en/properties
View File

@ -1,6 +1,3 @@
encoding=utf-8
output_charset=utf-8
output_encoding=utf-8
admin.content.client_agents=Create or delete company operators. Manage their permissions. admin.content.client_agents=Create or delete company operators. Manage their permissions.
admin.content.client_gen_button=Button HTML code generation. admin.content.client_gen_button=Button HTML code generation.
admin.content.client_settings=Specify options affecting chat window and common system behavior. admin.content.client_settings=Specify options affecting chat window and common system behavior.

2
src/mibew/locales/names/level1
View File

@ -66,8 +66,6 @@ mailthread.perform
mailthread.title mailthread.title
notify.new.subject notify.new.subject
notify.new.text notify.new.text
output_charset
output_encoding
page.chat.old_browser.close page.chat.old_browser.close
page.chat.old_browser.list page.chat.old_browser.list
page.chat.old_browser.problem page.chat.old_browser.problem

2
src/mibew/locales/names/properties
View File

@ -1,5 +1,3 @@
encoding=utf-8
ar=العربية ar=العربية
be=Беларуская be=Беларуская
bg=Български bg=Български

28
src/mibew/operator/translate.php
View File

@ -104,22 +104,20 @@ if ($show == 's1') {
} }
foreach ($all_keys as $key) { foreach ($all_keys as $key) {
if ($key != 'output_charset') { $t_source = htmlspecialchars($lang1[$key]);
$t_source = htmlspecialchars($lang1[$key]); if (isset($lang2[$key])) {
if (isset($lang2[$key])) { $value = htmlspecialchars($lang2[$key]);
$value = htmlspecialchars($lang2[$key]); } else {
} else { $value = "<font color=\"#c13030\"><b>absent</b></font>";
$value = "<font color=\"#c13030\"><b>absent</b></font>";
}
$result[] = array(
'id' => $key,
'l1' => $t_source,
'l2' => $value,
'idToPage' => $key,
'l1ToPage' => $t_source,
'l2ToPage' => $value,
);
} }
$result[] = array(
'id' => $key,
'l1' => $t_source,
'l2' => $value,
'idToPage' => $key,
'l1ToPage' => $t_source,
'l2ToPage' => $value,
);
} }
$order = verify_param("sort", "/^(id|l1)$/", "id"); $order = verify_param("sort", "/^(id|l1)$/", "id");