fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

#17946293 : rss_reader 위젯의 rss_request() 함수의 잘못된 반환값을 수정하고, proc() 함수에서 연결에 실패하였을 때 적절한 오류 메시지를 반환하도록 수정. 그리고, 이에 맞게 각 lang 파일에 메시지 코드 추가.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6142 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
mooo 2009-04-20 01:27:04 +00:00
parent f968bd65c0
commit 41f566f434
10 changed files with 33 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/lang/en.lang.php
View file

@ -221,6 +221,8 @@
$lang->msg_error_occured = 'An error has occured';
$lang->msg_not_founded = 'Target could not be found';
$lang->msg_no_result = 'Nothing found';
$lang->msg_fail_to_request_open = 'Fail to open your request';
$lang->msg_invalid_format = 'Invalid Format';
$lang->msg_not_permitted_act = 'You do not have permission to execute requested action';
$lang->msg_module_is_not_exists = 'Requested module could not be found';

8
common/lang/es.lang.php
View file

@ -80,7 +80,7 @@
$lang->none_image = '이미지 없음';
$lang->document_srl = 'Número del documento';
$lang->user_id = 'ID de Usuario';
$lang->author = 'Autor';
$lang->author = 'Autor';
$lang->password = 'Contraseña';
$lang->password1 = 'Contraseña';
$lang->password2 = 'Otra vez la contraseña';
@ -127,7 +127,7 @@
$lang->layout = 'Composición';
$lang->widget = 'Widget';
$lang->module = 'Módulo';
$lang->skin = 'Tema'; //máscara,
$lang->skin = 'Tema'; //máscara,
$lang->colorset = 'Conjunto de Colores';
$lang->extra_vars = 'Variables Extra';
@ -210,7 +210,7 @@
'hours' => '%d días',
);
// Relacionado a la Descripción
// Relacionado a la Descripción
$lang->about_tag = 'Puede agregar o añadir diversas etiquetas separándolas con la coma(,)'; // revisado hasta aquí (081007: Juan Lee)
$lang->about_layout = 'Puede modificar la apariencia(Layout/Diseño) de los módulos. Puede administrarla con el menú Layout.';
@ -227,6 +227,8 @@
$lang->msg_error_occured = 'Error';
$lang->msg_not_founded = 'No se ha encontrado';
$lang->msg_no_result = 'Sin resultado';
$lang->msg_fail_to_request_open = 'Fail to open your request';
$lang->msg_invalid_format = 'Invalid Format';
$lang->msg_not_permitted_act = 'No está permitodo para ejecutar esta acción';
$lang->msg_module_is_not_exists = 'No existe el Módulo requerido';

10
common/lang/fr.lang.php
View file

@ -2,10 +2,10 @@
/**
* @file common/lang/fr.lang.php
* @author zero (zero@nzeo.com) Traduit par Pierre Duvent(PierreDuvent@gamil.com)
* @brief Paquet du langage en français
* @brief Paquet du langage en français
**/
// verbes et mots fondamentaux qui décrivent des actions
// verbes et mots fondamentaux qui décrivent des actions
$lang->cmd_write = 'Ecrire';
$lang->cmd_reply = 'Répondre';
$lang->cmd_delete = 'Supprimer';
@ -44,8 +44,8 @@
$lang->cmd_make = 'Créer';
$lang->cmd_select = 'Choisir';
$lang->cmd_select_all = 'Choisir Tout';
$lang->cmd_unselect_all = 'Annuler Tout';
$lang->cmd_reverse_all = 'Renverser la Sélection';
$lang->cmd_unselect_all = 'Annuler Tout';
$lang->cmd_reverse_all = 'Renverser la Sélection';
$lang->cmd_close_all = 'Fermer Tout';
$lang->cmd_open_all = 'Ouvrir Tout';
$lang->cmd_reload = 'Recharger';
@ -221,6 +221,8 @@
$lang->msg_error_occured = 'Une erreur a lieu';
$lang->msg_not_founded = 'L\'objet n\'est pas trouvé.';
$lang->msg_no_result = 'Nul Résultat';
$lang->msg_fail_to_request_open = 'Fail to open your request';
$lang->msg_invalid_format = 'Invalid Format';
$lang->msg_not_permitted_act = 'Vous n\'êtes pas autorisés à exécuter l\'action que vous avez demandé.';
$lang->msg_module_is_not_exists = 'Le module demandé n\'a pas été trouvé.';

2
common/lang/ge.lang.php
View file

@ -221,6 +221,8 @@
$lang->msg_error_occured = 'Ein Fehler ist aufgetreten ';
$lang->msg_not_founded = 'Target konnte nicht gefunden werden';
$lang->msg_no_result = 'Nichts gefunden';
$lang->msg_fail_to_request_open = 'Fail to open your request';
$lang->msg_invalid_format = 'Invalid Format';
$lang->msg_not_permitted_act = 'Sie haben keine Berechtigung zur Ausführung angeforderte Aktion';
$lang->msg_module_is_not_exists = 'Gewünschte Modul konnte nicht gefunden werden';

2
common/lang/jp.lang.php
View file

@ -221,6 +221,8 @@
$lang->msg_error_occured = 'エラーが発生しました。';
$lang->msg_not_founded = '見つかりません。';
$lang->msg_no_result = '検索結果がありません。';
$lang->msg_fail_to_request_open = 'Fail to open your request';
$lang->msg_invalid_format = 'Invalid Format';
$lang->msg_not_permitted_act = '現在の操作は実行する権限がありません。';
$lang->msg_module_is_not_exists = 'モジュールが見つかりません。';

4
common/lang/ko.lang.php
View file

@ -204,7 +204,7 @@
'hours' => '%d 시간전',
);
// 설명 관련
// 설명 관련
$lang->about_tag = '태그 입력시 , (쉼표)를 이용하시면 복수 등록이 가능합니다';
$lang->about_layout = '레이아웃은 모듈의 껍데기를 꾸며줍니다. 상단 레이아웃 메뉴에서 관리하실 수 있습니다';
@ -221,6 +221,8 @@
$lang->msg_error_occured = '오류가 발생하였습니다';
$lang->msg_not_founded = '대상을 찾을 수 없습니다';
$lang->msg_no_result = '검색 결과가 없습니다';
$lang->msg_fail_to_request_open = '요청하신 연결에 실패하였습니다';
$lang->msg_invalid_format = '잘못된 형식입니다';
$lang->msg_not_permitted_act = '요청하신 기능을 실행할 수 있는 권한이 없습니다';
$lang->msg_module_is_not_exists = '요청하신 모듈을 찾을 수 없습니다';

2
common/lang/ru.lang.php
View file

@ -219,6 +219,8 @@
$lang->msg_error_occured = 'Произошла ошибка';
$lang->msg_not_founded = 'Сообщение не найдено';
$lang->msg_no_result = 'Ничего не найдено';
$lang->msg_fail_to_request_open = 'Fail to open your request';
$lang->msg_invalid_format = 'Invalid Format';
$lang->msg_not_permitted_act = 'У Вас нет прав для исполнения запрошенного действия';
$lang->msg_module_is_not_exists = 'Запрошенный модуль не найден';

6
common/lang/zh-CN.lang.php
View file

@ -221,6 +221,8 @@
$lang->msg_error_occured = '发生错误';
$lang->msg_not_founded = '没有找到相关内容';
$lang->msg_no_result = '找不到和您查询的相符结果';
$lang->msg_fail_to_request_open = 'Fail to open your request';
$lang->msg_invalid_format = 'Invalid Format';
$lang->msg_not_permitted_act = '没有权限执行 action命令';
$lang->msg_module_is_not_exists = '找不到您查询的模块';
@ -237,10 +239,10 @@
$lang->success_reset = '初始化成功 !';
$lang->success_leaved = '注销成功！';
$lang->success_saved = '保存成功！';
$lang->fail_to_delete = '删除成功！';
$lang->fail_to_move = '移动成功！';
$lang->failed_voted = '您不能推荐！';
$lang->failed_blamed = '您不能投反对！';
$lang->failed_declared = '您不具备举报权限！';

2
common/lang/zh-TW.lang.php
View file

@ -221,6 +221,8 @@
$lang->msg_error_occured = '發生錯誤';
$lang->msg_not_founded = '找不到相關內容';
$lang->msg_no_result = '找不到與您查詢的相符結果';
$lang->msg_fail_to_request_open = 'Fail to open your request';
$lang->msg_invalid_format = 'Invalid Format';
$lang->msg_not_permitted_act = '沒有權限執行';
$lang->msg_module_is_not_exists = '找不到您查詢的模組';

10
widgets/rss_reader/rss_reader.class.php
View file

@ -45,10 +45,10 @@
$oResponse = $oReqeust->sendRequest();
if (PEAR::isError($oResponse)) {
return new Object(-1, 'msg_fail_to_request_open');
return;
}
$header = $oReqeust->getResponseHeader();
if($header['location']) {
if($header['location']) {
return $this->rss_request(trim($header['location']));
}
else {
@ -73,7 +73,7 @@
$buff = $this->rss_request($args->rss_url);
if(!$buff) return new Object(-1, 'msg_fail_to_request_open');
if(!is_string($buff) or !$buff) return Context::getLang('msg_fail_to_request_open');
$encoding = preg_match("/<\?xml.*encoding=\"(.+)\".*\?>/i", $buff, $matches);
if($encoding && !preg_match("/UTF-8/i", $matches[1])) $buff = trim(iconv($matches[1]=="ks_c_5601-1987"?"EUC-KR":$matches[1], "UTF-8", $buff));
@ -86,8 +86,8 @@
$rss->link = $xml_doc->rss->channel->link->body;
$items = $xml_doc->rss->channel->item;
if(!$items) return;
if(!$items) return Context::getLang('msg_invalid_format');
if($items && !is_array($items)) $items = array($items);
$rss_list = array();