From ec7839c8dbc16bd6aa4364b349c482d7f730d470 Mon Sep 17 00:00:00 2001 From: gigamaster <1905497+gigamaster@users.noreply.github.com> Date: Thu, 6 Jun 2024 03:44:52 +0200 Subject: [PATCH] PHP8.2 fix Constant language --- html/include/functions.php | 2 +- .../plugins/a11yhelp/dialogs/lang/zh-cn.js | 9 -- .../plugins/a11yhelp/dialogs/lang/zh.js | 9 -- .../plugins/specialchar/dialogs/lang/zh-cn.js | 125 ------------------ .../plugins/specialchar/dialogs/lang/zh.js | 125 ------------------ .../plugins/specialchar/lang/zh-cn.js | 9 -- .../kernel/Legacy_BlockProcedure.class.php | 5 +- html/modules/legacy/kernel/object.php | 2 +- .../modules/legacy/language/fr_utf8/admin.php | 8 +- html/modules/legacyRender/admin/menu.php | 2 +- .../sitemap/blocks/sitemap_block_map.php | 8 +- .../sitemap/language/english/blocks.php | 23 ++++ .../sitemap/language/english/modinfo.php | 20 +-- .../sitemap/language/fr_utf8/blocks.php | 25 ++++ .../sitemap/language/fr_utf8/modinfo.php | 22 +-- .../sitemap/language/ja_utf8/blocks.php | 25 ++++ .../sitemap/language/ja_utf8/modinfo.php | 20 +-- .../sitemap/language/pt_utf8/blocks.php | 24 ++++ .../sitemap/language/pt_utf8/modinfo.php | 20 +-- .../sitemap/language/ru_utf8/blocks.php | 25 ++++ .../sitemap/language/ru_utf8/modinfo.php | 20 +-- html/modules/sitemap/xoops_version.php | 2 +- html/themes/bs5-starter/CHANGELOG.md | 1 + .../component/_inc_top_center.html | 6 +- html/themes/xcl_default/theme.html | 2 +- html/xoops.css | 17 --- .../language/fr_utf8/compilehookadmin.php | 18 +-- .../modules/d3forum/language/fr_utf8/main.php | 4 +- 28 files changed, 157 insertions(+), 421 deletions(-) delete mode 100644 html/modules/ckeditor4/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js delete mode 100644 html/modules/ckeditor4/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js delete mode 100644 html/modules/ckeditor4/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js delete mode 100644 html/modules/ckeditor4/ckeditor/plugins/specialchar/dialogs/lang/zh.js delete mode 100644 html/modules/ckeditor4/ckeditor/plugins/specialchar/lang/zh-cn.js delete mode 100644 html/xoops.css diff --git a/html/include/functions.php b/html/include/functions.php index 928a7d722..561a7b434 100644 --- a/html/include/functions.php +++ b/html/include/functions.php @@ -701,7 +701,7 @@ function xoops_getrank($rank_id =0, $posts = 0) function xoops_substr($str, $start, $length, $trimmarker = '...') { if (!XOOPS_USE_MULTIBYTES) { - return (strlen($str) - $start <= $length) ? substr($str, $start, $length) : substr($str, $start, $length - strlen($trimmarker)) . $trimmarker; + return (strlen($str) ?? '' - $start <= $length) ? substr($str, $start, $length) : substr($str, $start, $length - strlen($trimmarker)) . $trimmarker; } if (function_exists('mb_internal_encoding') && @mb_internal_encoding(_CHARSET)) { $str2 = mb_strcut($str, $start, $length - strlen($trimmarker)); diff --git a/html/modules/ckeditor4/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/html/modules/ckeditor4/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js deleted file mode 100644 index 858d15958..000000000 --- a/html/modules/ckeditor4/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved. - CKEditor 4 LTS ("Long Term Support") is available under the terms of the Extended Support Model. -*/ -CKEDITOR.plugins.setLang("a11yhelp","zh-cn",{title:"辅助功能说明",contents:"帮助内容。要关闭此对话框请按 ESC 键。",legend:[{name:"常规",items:[{name:"编辑器工具栏",legend:"按 ${toolbarFocus} 切换到工具栏，使用 TAB 键和 SHIFT+TAB 组合键移动到上一个和下一个工具栏组。使用左右箭头键移动到上一个或下一个工具栏按钮。按空格键或回车键以选中工具栏按钮。"},{name:"编辑器对话框",legend:"在对话框内，按 TAB 键移动到下一个字段，按 SHIFT + TAB 组合键移动到上一个字段，按 ENTER 键提交对话框，按 ESC 键取消对话框。对于有多选项卡的对话框，可以按 ALT + F10 直接切换到或者按 TAB 键逐步移到选项卡列表，当焦点移到选项卡列表时可以用左右箭头键来移动到前后的选项卡。"},{name:"编辑器上下文菜单",legend:"用 ${contextMenu} 或者“应用程序键”打开上下文菜单。然后用 TAB 键或者下箭头键来移动到下一个菜单项；SHIFT + TAB 组合键或者上箭头键移动到上一个菜单项。用 SPACE 键或者 ENTER 键选择菜单项。用 SPACE 键，ENTER 键或者右箭头键打开子菜单。返回菜单用 ESC 键或者左箭头键。用 ESC 键关闭上下文菜单。"}, -{name:"编辑器列表框",legend:"在列表框中，移到下一列表项用 TAB 键或者下箭头键。移到上一列表项用SHIFT+TAB 组合键或者上箭头键，用 SPACE 键或者 ENTER 键选择列表项。用 ESC 键收起列表框。"},{name:"编辑器元素路径栏",legend:"按 ${elementsPathFocus} 以导航到元素路径栏，使用 TAB 键或右箭头键选择下一个元素，使用 SHIFT+TAB 组合键或左箭头键选择上一个元素，按空格键或回车键以选定编辑器里的元素。"}]},{name:"命令",items:[{name:" 撤消命令",legend:"按 ${undo}"},{name:" 重做命令",legend:"按 ${redo}"},{name:" 加粗命令",legend:"按 ${bold}"},{name:" 倾斜命令",legend:"按 ${italic}"},{name:" 下划线命令",legend:"按 ${underline}"},{name:" 链接命令",legend:"按 ${link}"},{name:" 工具栏折叠命令",legend:"按 ${toolbarCollapse}"}, -{name:"访问前一个焦点区域的命令",legend:"按 ${accessPreviousSpace} 访问^符号前最近的不可访问的焦点区域，例如：两个相邻的 HR 元素。重复此组合按键可以到达远处的焦点区域。"},{name:"访问下一个焦点区域命令",legend:"按 ${accessNextSpace} 以访问^符号后最近的不可访问的焦点区域。例如：两个相邻的 HR 元素。重复此组合按键可以到达远处的焦点区域。"},{name:"辅助功能帮助",legend:"按 ${a11yHelp}"},{name:"粘贴为纯文本",legend:"按 ${pastetext}",legendEdge:"按 ${pastetext}，然后再按 ${paste}"}]}],tab:"Tab 键",pause:"暂停键",capslock:"大写锁定键",escape:"Esc 键",pageUp:"上翻页键",pageDown:"下翻页键",leftArrow:"向左箭头键",upArrow:"向上箭头键",rightArrow:"向右箭头键",downArrow:"向下箭头键",insert:"插入键", -leftWindowKey:"左 WIN 键",rightWindowKey:"右 WIN 键",selectKey:"选择键",numpad0:"小键盘 0 键",numpad1:"小键盘 1 键",numpad2:"小键盘 2 键",numpad3:"小键盘 3 键",numpad4:"小键盘 4 键",numpad5:"小键盘 5 键",numpad6:"小键盘 6 键",numpad7:"小键盘 7 键",numpad8:"小键盘 8 键",numpad9:"小键盘 9 键",multiply:"星号键",add:"加号键",subtract:"减号键",decimalPoint:"小数点键",divide:"除号键",f1:"F1 键",f2:"F2 键",f3:"F3 键",f4:"F4 键",f5:"F5 键",f6:"F6 键",f7:"F7 键",f8:"F8 键",f9:"F9 键",f10:"F10 键",f11:"F11 键",f12:"F12 键",numLock:"数字锁定键",scrollLock:"滚动锁定键",semiColon:"分号键",equalSign:"等号键", -comma:"逗号键",dash:"短划线键",period:"句号键",forwardSlash:"斜杠键",graveAccent:"重音符键",openBracket:"左中括号键",backSlash:"反斜杠键",closeBracket:"右中括号键",singleQuote:"单引号键"}); \ No newline at end of file diff --git a/html/modules/ckeditor4/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js b/html/modules/ckeditor4/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js deleted file mode 100644 index c065a6869..000000000 --- a/html/modules/ckeditor4/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js +++ /dev/null @@ -1,9 +0,0 @@ -/* - Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved. - CKEditor 4 LTS ("Long Term Support") is available under the terms of the Extended Support Model. -*/ -CKEDITOR.plugins.setLang("a11yhelp","zh",{title:"輔助工具指南",contents:"說明內容。若要關閉此對話框請按「ESC」。",legend:[{name:"一般",items:[{name:"編輯器工具列",legend:"請按 ${toolbarFocus} 以導覽到工具列。利用 TAB 或 SHIFT+TAB 以便移動到下一個及前一個工具列群組。利用右方向鍵或左方向鍵以便移動到下一個及上一個工具列按鈕。按下空白鍵或 ENTER 鍵啟用工具列按鈕。啟用工作列按鈕時，焦點將會移回至編輯區域。"},{name:"編輯器對話方塊",legend:"在對話框中，按下 TAB 鍵以導覽到下一個對話框元素，按下 SHIFT+TAB 以移動到上一個對話框元素，按下 ENTER 以遞交對話框，按下 ESC 以取消對話框。當對話框有多個分頁時，可以使用 ALT+F10 或是在對話框分頁順序中的一部份按下 TAB 以使用分頁列表。焦點在分頁列表上時，分別使用右方向鍵及左方向鍵移動到下一個及上一個分頁。按下 ESC 以放棄變更且關閉對話方塊。離開對話方塊時，焦點將會移回至編輯區域。"}, -{name:"編輯器內容功能表",legend:"請按下「${contextMenu}」或是「應用程式鍵」以開啟內容選單。以「TAB」或是「↓」鍵移動到下一個選單選項。以「SHIFT + TAB」或是「↑」鍵移動到上一個選單選項。按下「空白鍵」或是「ENTER」鍵以選取選單選項。以「空白鍵」或「ENTER」或「→」開啟目前選項之子選單。以「ESC」或「←」回到父選單。以「ESC」鍵關閉內容選單」。"},{name:"編輯器清單方塊",legend:"在清單方塊中，使用 TAB 或下方向鍵移動到下一個列表項目。使用 SHIFT+TAB 或上方向鍵移動到上一個列表項目。按下空白鍵或 ENTER 以選取列表選項。按下 ESC 以關閉清單方塊。"},{name:"編輯器元件路徑工具列",legend:"請按 ${elementsPathFocus} 以瀏覽元素路徑列。利用 TAB 或右方向鍵以便移動到下一個元素按鈕。利用 SHIFT 或左方向鍵以便移動到上一個按鈕。按下空白鍵或 ENTER 鍵來選取在編輯器中的元素。"}]},{name:"命令",items:[{name:"復原命令",legend:"請按下「${undo}」"}, -{name:"重複命令",legend:"請按下「 ${redo}」"},{name:"粗體命令",legend:"請按下「${bold}」"},{name:"斜體",legend:"請按下「${italic}」"},{name:"底線命令",legend:"請按下「${underline}」"},{name:"連結",legend:"請按下「${link}」"},{name:"隱藏工具列",legend:"請按下「${toolbarCollapse}」"},{name:"存取前一個焦點空間命令",legend:"請按下 ${accessPreviousSpace} 以存取最近但無法靠近之插字符號前的焦點空間。舉例：二個相鄰的 HR 元素。\r\n重複按鍵以存取較遠的焦點空間。"},{name:"存取下一個焦點空間命令",legend:"請按下 ${accessNextSpace} 以存取最近但無法靠近之插字符號後的焦點空間。舉例：二個相鄰的 HR 元素。\r\n重複按鍵以存取較遠的焦點空間。"},{name:"協助工具說明",legend:"請按下「${a11yHelp}」"},{name:"以純文字貼上", -legend:"按 ${pastetext}",legendEdge:"按 ${pastetext}，再來是 ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Esc",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"向左箭號",upArrow:"向上鍵號",rightArrow:"向右鍵號",downArrow:"向下鍵號",insert:"插入",leftWindowKey:"左方 Windows 鍵",rightWindowKey:"右方 Windows 鍵",selectKey:"選擇鍵",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9", -multiply:"乘號",add:"新增",subtract:"減號",decimalPoint:"小數點",divide:"除號",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"分號",equalSign:"等號",comma:"逗號",dash:"虛線",period:"句點",forwardSlash:"斜線",graveAccent:"抑音符號",openBracket:"左方括號",backSlash:"反斜線",closeBracket:"右方括號",singleQuote:"單引號"}); \ No newline at end of file diff --git a/html/modules/ckeditor4/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/html/modules/ckeditor4/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js deleted file mode 100644 index 080c8b027..000000000 --- a/html/modules/ckeditor4/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js +++ /dev/null @@ -1,125 +0,0 @@ -/** - * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved. - * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license - */ - -CKEDITOR.plugins.setLang( 'specialchar', 'zh-cn', { - euro: '欧元符号', - lsquo: '左单引号', - rsquo: '右单引号', - ldquo: '左双引号', - rdquo: '右双引号', - ndash: '短划线', - mdash: '长划线', - iexcl: '竖翻叹号', - cent: '分币符号', - pound: '英镑符号', - curren: '货币符号', - yen: '日元符号', - brvbar: '间断条', - sect: '节标记', - uml: '分音符', - copy: '版权所有标记', - ordf: '阴性顺序指示符', - laquo: '左指双尖引号', - not: '非标记', - reg: '注册标记', - macr: '长音符', - deg: '度标记', - sup2: '上标二', - sup3: '上标三', - acute: '锐音符', - micro: '微符', - para: '段落标记', - middot: '中间点', - cedil: '下加符', - sup1: '上标一', - ordm: '阳性顺序指示符', - raquo: '右指双尖引号', - frac14: '普通分数四分之一', - frac12: '普通分数二分之一', - frac34: '普通分数四分之三', - iquest: '竖翻问号', - Agrave: '带抑音符的拉丁文大写字母 A', - Aacute: '带锐音符的拉丁文大写字母 A', - Acirc: '带扬抑符的拉丁文大写字母 A', - Atilde: '带颚化符的拉丁文大写字母 A', - Auml: '带分音符的拉丁文大写字母 A', - Aring: '带上圆圈的拉丁文大写字母 A', - AElig: '拉丁文大写字母 Æ', - Ccedil: '带下加符的拉丁文大写字母 C', - Egrave: '带抑音符的拉丁文大写字母 E', - Eacute: '带锐音符的拉丁文大写字母 E', - Ecirc: '带扬抑符的拉丁文大写字母 E', - Euml: '带分音符的拉丁文大写字母 E', - Igrave: '带抑音符的拉丁文大写字母 I', - Iacute: '带锐音符的拉丁文大写字母 I', - Icirc: '带扬抑符的拉丁文大写字母 I', - Iuml: '带分音符的拉丁文大写字母 I', - ETH: '拉丁文大写字母 Eth', - Ntilde: '带颚化符的拉丁文大写字母 N', - Ograve: '带抑音符的拉丁文大写字母 O', - Oacute: '带锐音符的拉丁文大写字母 O', - Ocirc: '带扬抑符的拉丁文大写字母 O', - Otilde: '带颚化符的拉丁文大写字母 O', - Ouml: '带分音符的拉丁文大写字母 O', - times: '乘号', - Oslash: '带粗线的拉丁文大写字母 O', - Ugrave: '带抑音符的拉丁文大写字母 U', - Uacute: '带锐音符的拉丁文大写字母 U', - Ucirc: '带扬抑符的拉丁文大写字母 U', - Uuml: '带分音符的拉丁文大写字母 U', - Yacute: '带抑音符的拉丁文大写字母 Y', - THORN: '拉丁文大写字母 Thorn', - szlig: '拉丁文小写字母清音 S', - agrave: '带抑音符的拉丁文小写字母 A', - aacute: '带锐音符的拉丁文小写字母 A', - acirc: '带扬抑符的拉丁文小写字母 A', - atilde: '带颚化符的拉丁文小写字母 A', - auml: '带分音符的拉丁文小写字母 A', - aring: '带上圆圈的拉丁文小写字母 A', - aelig: '拉丁文小写字母 Ae', - ccedil: '带下加符的拉丁文小写字母 C', - egrave: '带抑音符的拉丁文小写字母 E', - eacute: '带锐音符的拉丁文小写字母 E', - ecirc: '带扬抑符的拉丁文小写字母 E', - euml: '带分音符的拉丁文小写字母 E', - igrave: '带抑音符的拉丁文小写字母 I', - iacute: '带锐音符的拉丁文小写字母 I', - icirc: '带扬抑符的拉丁文小写字母 I', - iuml: '带分音符的拉丁文小写字母 I', - eth: '拉丁文小写字母 Eth', - ntilde: '带颚化符的拉丁文小写字母 N', - ograve: '带抑音符的拉丁文小写字母 O', - oacute: '带锐音符的拉丁文小写字母 O', - ocirc: '带扬抑符的拉丁文小写字母 O', - otilde: '带颚化符的拉丁文小写字母 O', - ouml: '带分音符的拉丁文小写字母 O', - divide: '除号', - oslash: '带粗线的拉丁文小写字母 O', - ugrave: '带抑音符的拉丁文小写字母 U', - uacute: '带锐音符的拉丁文小写字母 U', - ucirc: '带扬抑符的拉丁文小写字母 U', - uuml: '带分音符的拉丁文小写字母 U', - yacute: '带抑音符的拉丁文小写字母 Y', - thorn: '拉丁文小写字母 Thorn', - yuml: '带分音符的拉丁文小写字母 Y', - OElig: '拉丁文大写连字 Oe', - oelig: '拉丁文小写连字 Oe', - '372': '带扬抑符的拉丁文大写字母 W', - '374': '带扬抑符的拉丁文大写字母 Y', - '373': '带扬抑符的拉丁文小写字母 W', - '375': '带扬抑符的拉丁文小写字母 Y', - sbquo: '单下 9 形引号', - '8219': '单高横翻 9 形引号', - bdquo: '双下 9 形引号', - hellip: '水平省略号', - trade: '商标标志', - '9658': '实心右指指针', - bull: '加重号', - rarr: '向右箭头', - rArr: '向右双线箭头', - hArr: '左右双线箭头', - diams: '实心方块纸牌', - asymp: '约等于' -} ); diff --git a/html/modules/ckeditor4/ckeditor/plugins/specialchar/dialogs/lang/zh.js b/html/modules/ckeditor4/ckeditor/plugins/specialchar/dialogs/lang/zh.js deleted file mode 100644 index c13d290d9..000000000 --- a/html/modules/ckeditor4/ckeditor/plugins/specialchar/dialogs/lang/zh.js +++ /dev/null @@ -1,125 +0,0 @@ -/** - * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved. - * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license - */ - -CKEDITOR.plugins.setLang( 'specialchar', 'zh', { - euro: '歐元符號', - lsquo: '左單引號', - rsquo: '右單引號', - ldquo: '左雙引號', - rdquo: '右雙引號', - ndash: '短破折號', - mdash: '長破折號', - iexcl: '倒置的驚嘆號', - cent: '美分符號', - pound: '英鎊符號', - curren: '貨幣符號', - yen: '日圓符號', - brvbar: '破折號', - sect: '章節符號', - uml: '分音符號', - copy: '版權符號', - ordf: '雌性符號', - laquo: '左雙角括號', - not: 'Not 符號', - reg: '註冊商標符號', - macr: '長音符號', - deg: '度數符號', - sup2: '上標字 2', - sup3: '上標字 3', - acute: '尖音符號', - micro: '微', - para: '段落符號', - middot: '中間點', - cedil: '字母 C 下面的尾型符號 ', - sup1: '上標', - ordm: '雄性符號', - raquo: '右雙角括號', - frac14: '四分之一符號', - frac12: '二分之一符號', - frac34: '四分之三符號', - iquest: '倒置的問號', - Agrave: '拉丁大寫字母 A 帶抑音符號', - Aacute: '拉丁大寫字母 A 帶尖音符號', - Acirc: '拉丁大寫字母 A 帶揚抑符', - Atilde: '拉丁大寫字母 A 帶波浪號', - Auml: '拉丁大寫字母 A 帶分音符號', - Aring: '拉丁大寫字母 A 帶上圓圈', - AElig: '拉丁大寫字母 Æ', - Ccedil: '拉丁大寫字母 C 帶下尾符號', - Egrave: '拉丁大寫字母 E 帶抑音符號', - Eacute: '拉丁大寫字母 E 帶尖音符號', - Ecirc: '拉丁大寫字母 E 帶揚抑符', - Euml: '拉丁大寫字母 E 帶分音符號', - Igrave: '拉丁大寫字母 I 帶抑音符號', - Iacute: '拉丁大寫字母 I 帶尖音符號', - Icirc: '拉丁大寫字母 I 帶揚抑符', - Iuml: '拉丁大寫字母 I 帶分音符號', - ETH: '拉丁大寫字母 Eth', - Ntilde: '拉丁大寫字母 N 帶波浪號', - Ograve: '拉丁大寫字母 O 帶抑音符號', - Oacute: '拉丁大寫字母 O 帶尖音符號', - Ocirc: '拉丁大寫字母 O 帶揚抑符', - Otilde: '拉丁大寫字母 O 帶波浪號', - Ouml: '拉丁大寫字母 O 帶分音符號', - times: '乘號', - Oslash: '拉丁大寫字母 O 帶粗線符號', - Ugrave: '拉丁大寫字母 U 帶抑音符號', - Uacute: '拉丁大寫字母 U 帶尖音符號', - Ucirc: '拉丁大寫字母 U 帶揚抑符', - Uuml: '拉丁大寫字母 U 帶分音符號', - Yacute: '拉丁大寫字母 Y 帶尖音符號', - THORN: '拉丁大寫字母 Thorn', - szlig: '拉丁小寫字母 s', - agrave: '拉丁小寫字母 a 帶抑音符號', - aacute: '拉丁小寫字母 a 帶尖音符號', - acirc: '拉丁小寫字母 a 帶揚抑符', - atilde: '拉丁小寫字母 a 帶波浪號', - auml: '拉丁小寫字母 a 帶分音符號', - aring: '拉丁小寫字母 a 帶上圓圈', - aelig: '拉丁小寫字母 æ', - ccedil: '拉丁小寫字母 c 帶下尾符號', - egrave: '拉丁小寫字母 e 帶抑音符號', - eacute: '拉丁小寫字母 e 帶尖音符號', - ecirc: '拉丁小寫字母 e 帶揚抑符', - euml: '拉丁小寫字母 e 帶分音符號', - igrave: '拉丁小寫字母 i 帶抑音符號', - iacute: '拉丁小寫字母 i 帶尖音符號', - icirc: '拉丁小寫字母 i 帶揚抑符', - iuml: '拉丁小寫字母 i 帶分音符號', - eth: '拉丁小寫字母 eth', - ntilde: '拉丁小寫字母 n 帶波浪號', - ograve: '拉丁小寫字母 o 帶抑音符號', - oacute: '拉丁小寫字母 o 帶尖音符號', - ocirc: '拉丁小寫字母 o 帶揚抑符', - otilde: '拉丁小寫字母 o 帶波浪號', - ouml: '拉丁小寫字母 o 帶分音符號', - divide: '除號', - oslash: '拉丁小寫字母 o 帶粗線符號', - ugrave: '拉丁小寫字母 u 帶抑音符號', - uacute: '拉丁小寫字母 u 帶尖音符號', - ucirc: '拉丁小寫字母 u 帶揚抑符', - uuml: '拉丁小寫字母 u 帶分音符號', - yacute: '拉丁小寫字母 y 帶尖音符號', - thorn: '拉丁小寫字母 thorn', - yuml: '拉丁小寫字母 y 帶分音符號', - OElig: '拉丁大寫字母 OE', - oelig: '拉丁小寫字母 oe', - '372': '拉丁大寫字母 W 帶揚抑符', - '374': '拉丁大寫字母 Y 帶揚抑符', - '373': '拉丁小寫字母 w 帶揚抑符', - '375': '拉丁小寫字母 y 帶揚抑符', - sbquo: '低 9 單引號', - '8219': '高 9 反轉單引號', - bdquo: '低 9 雙引號', - hellip: '水平刪節號', - trade: '商標符號', - '9658': '黑色向右指箭號', - bull: '項目符號', - rarr: '向右箭號', - rArr: '向右雙箭號', - hArr: '左右雙箭號', - diams: '黑鑽套裝', - asymp: '約等於' -} ); diff --git a/html/modules/ckeditor4/ckeditor/plugins/specialchar/lang/zh-cn.js b/html/modules/ckeditor4/ckeditor/plugins/specialchar/lang/zh-cn.js deleted file mode 100644 index 5bf2ab3cc..000000000 --- a/html/modules/ckeditor4/ckeditor/plugins/specialchar/lang/zh-cn.js +++ /dev/null @@ -1,9 +0,0 @@ -/* -Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved. -For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license -*/ -CKEDITOR.plugins.setLang( 'specialchar', 'zh-cn', { - options: '特殊符号选项', - title: '选择特殊符号', - toolbar: '插入特殊符号' -} ); diff --git a/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php b/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php index d382e874b..ebb79e6d8 100644 --- a/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php +++ b/html/modules/legacy/kernel/Legacy_BlockProcedure.class.php @@ -228,7 +228,7 @@ public function getWeight() /** * @public * @breaf [Secret Agreement] Gets a value indicating whether the option form of this block needs the row to display the form. - * @remark Only block management actions should use this method, and this method should not be overridden usually. + * @remark Only block management actions should use this method, and generally this method should not be replaced. */ public function _hasVisibleOptionForm() { @@ -256,8 +256,6 @@ class Legacy_BlockProcedureAdapter extends Legacy_BlockProcedure public function execute() { - - $result =& $this->_mBlock->buildBlock(); if (empty($result)) { @@ -270,7 +268,6 @@ public function execute() $render->setAttribute('bid', $this->_mBlock->get('bid')); - if (null == $this->_mBlock->get('template')) { $render->setTemplateName('system_dummy.html'); $render->setAttribute('dummy_content', $result['content']); diff --git a/html/modules/legacy/kernel/object.php b/html/modules/legacy/kernel/object.php index 5241b712b..abd7e8f4d 100644 --- a/html/modules/legacy/kernel/object.php +++ b/html/modules/legacy/kernel/object.php @@ -91,7 +91,7 @@ public function assignVar($key, $value) case XOBJ_DTYPE_STRING: $len = $vars['maxlength']; - $vars['value'] = (null !== $len && strlen($value) > $len) ? xoops_substr($value, 0, $len, null) : $value; + $vars['value'] = (null !== $len && strlen($value ?? '') > $len) ? xoops_substr($value, 0, $len, null) : $value; return; case XOBJ_DTYPE_TEXT: diff --git a/html/modules/legacy/language/fr_utf8/admin.php b/html/modules/legacy/language/fr_utf8/admin.php index 30db24167..1f5d81347 100644 --- a/html/modules/legacy/language/fr_utf8/admin.php +++ b/html/modules/legacy/language/fr_utf8/admin.php @@ -142,10 +142,10 @@ define( '_AD_LEGACY_LANG_CTYPE_PHP' , "PHP"); define( '_AD_LEGACY_LANG_CTYPE_WITH_SMILIES' , "Format automatique avec émoticones"); define( '_AD_LEGACY_LANG_CTYPE_WITHOUT_SMILIES' , "Format automatique sans émoticones"); -define( '_AD_LEGACY_LANG_CUSTOM_HTML' , "Bloc personnalisé HTML"); +define( '_AD_LEGACY_LANG_CUSTOM_HTML' , "Bloc HTML"); define( '_AD_LEGACY_LANG_CUSTOM_PHP' , "Bloc personnalisé PHP"); -define( '_AD_LEGACY_LANG_CUSTOM_WITH_SMILIES' , "Bloc personnalisé avec émoticones"); -define( '_AD_LEGACY_LANG_CUSTOM_WITHOUT_SMILIES' , "Bloc personnalisé sans émoticones"); +define( '_AD_LEGACY_LANG_CUSTOM_WITH_SMILIES' , "Bloc avec émoticones"); +define( '_AD_LEGACY_LANG_CUSTOM_WITHOUT_SMILIES' , "Bloc sans émoticones"); define( '_AD_LEGACY_LANG_CUSTOMBLOCK_DELETE' , "Supprimer Bloc personnalisé"); define( '_AD_LEGACY_LANG_CUSTOMBLOCK_EDIT' , "Editer Bloc personnalisé"); define( '_AD_LEGACY_LANG_DEACTIVATE' , "Inactif"); @@ -174,7 +174,7 @@ define( '_AD_LEGACY_LANG_IMAGE_NEW' , "Ajouter Image"); define( '_AD_LEGACY_LANG_IMAGE_UPDATECONF' , "Confirmer mise à jour des images"); define( '_AD_LEGACY_LANG_IMAGE_UPLOAD' , "Télécharger Images par lot"); -define( '_AD_LEGACY_LANG_IMAGE_UPLOAD_FILE' , "Archive Image (archive tar.gz ou zip)"); +define( '_AD_LEGACY_LANG_IMAGE_UPLOAD_FILE' , "Archive Image (archive tar)"); define( '_AD_LEGACY_LANG_IMAGE_UPLOAD_RESULT' , "Résultat du téléchargement d'images par lot"); define( '_AD_LEGACY_LANG_IMAGE_TOTAL' , "Total d'Images"); define( '_AD_LEGACY_LANG_IMAGE_DISPLAYTOTAL' , "Images affichées"); diff --git a/html/modules/legacyRender/admin/menu.php b/html/modules/legacyRender/admin/menu.php index 3ea366288..5ba272851 100644 --- a/html/modules/legacyRender/admin/menu.php +++ b/html/modules/legacyRender/admin/menu.php @@ -1,6 +1,6 @@ "._MI_SHOW_SITENAME." + return "

"._MB_SHOW_SITENAME."

-

"._MI_SHOW_SLOGAN." +

"._MB_SHOW_SLOGAN."

-

"._MI_SHOW_MAP." +

"._MB_SHOW_MAP."

-

"._MI_SHOW_ADDRESS." +

"._MB_SHOW_ADDRESS."

"; diff --git a/html/modules/sitemap/language/english/blocks.php b/html/modules/sitemap/language/english/blocks.php index 6c8f7e517..3301560eb 100644 --- a/html/modules/sitemap/language/english/blocks.php +++ b/html/modules/sitemap/language/english/blocks.php @@ -3,4 +3,27 @@ define( '_MB_SITEMAP_OPENCLOSE' , 'Open - Close'); define( '_MB_SITEMAP_COLS' , 'Columns'); +// Block +define( '_MB_BLOCK_BLOCKNAME' , 'Sitemap Menu'); +define( '_MB_BLOCK_BLOCKNAME_DESC' , 'Use Sitemap to create a block menu.'); +define( '_MB_BLOCK_MAP' , 'Sitemap Map'); +define( '_MB_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); +// Options +define( '_MB_SHOW_SITENAME' , 'Show the site name'); +define( '_MB_SHOW_SITENAME_DESC' , 'Edit the site name in System »» Preferences »» Settings'); + +define( '_MB_SHOW_SLOGAN' , 'Show the site slogan'); +define( '_MB_SHOW_SLOGAN_DESC' , 'Edit the site slogan in System »» Preferences »» Settings'); + +define( '_MB_SHOW_MAP' , 'Show map'); +define( '_MB_SHOW_MAP_DESC' , 'DisplAy the embedded map in Sitemap page.'); + +define( '_MB_SHOW_MAP_CODE' , 'Embed Map HTML'); +define( '_MB_SHOW_MAP_CODE_DESC' , 'To integrate a Map ( e.g. Google Maps, OpenStreetMap), search for the location, click share and Embed a map, click Copy HTML. Default: width=100%, height=240'); + +define( '_MB_SHOW_ADDRESS' , 'Show adress'); +define( '_MB_SHOW_ADDRESS_DESC' , 'Display the contact address in Sitemap page.'); + +define( '_MB_SHOW_ADDRESS_CODE' , 'Contact adress'); +define( '_MB_SHOW_ADDRESS_CODE_DESC' , 'Use html tags "address" and "href=tel:" with the telephone number.'); \ No newline at end of file diff --git a/html/modules/sitemap/language/english/modinfo.php b/html/modules/sitemap/language/english/modinfo.php index e10d59357..9a3d37e4f 100644 --- a/html/modules/sitemap/language/english/modinfo.php +++ b/html/modules/sitemap/language/english/modinfo.php @@ -33,22 +33,4 @@ define( '_MI_BLOCK_BLOCKNAME_DESC' , 'Use Sitemap to create a block menu.'); define( '_MI_BLOCK_MAP' , 'Sitemap Map'); -define( '_MI_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); -// Options -define( '_MI_SHOW_SITENAME' , 'Show the site name'); -define( '_MI_SHOW_SITENAME_DESC' , 'Edit the site name in System »» Preferences »» Settings'); - -define( '_MI_SHOW_SLOGAN' , 'Show the site slogan'); -define( '_MI_SHOW_SLOGAN_DESC' , 'Edit the site slogan in System »» Preferences »» Settings'); - -define( '_MI_SHOW_MAP' , 'Show map'); -define( '_MI_SHOW_MAP_DESC' , 'DisplAy the embedded map in Sitemap page.'); - -define( '_MI_SHOW_MAP_CODE' , 'Embed Map HTML'); -define( '_MI_SHOW_MAP_CODE_DESC' , 'To integrate a Map ( e.g. Google Maps, OpenStreetMap), search for the location, click share and Embed a map, click Copy HTML. Default: width=100%, height=240'); - -define( '_MI_SHOW_ADDRESS' , 'Show adress'); -define( '_MI_SHOW_ADDRESS_DESC' , 'Display the contact address in Sitemap page.'); - -define( '_MI_SHOW_ADDRESS_CODE' , 'Contact adress'); -define( '_MI_SHOW_ADDRESS_CODE_DESC' , 'Use html tags "address" and "href=tel:" with the telephone number.'); \ No newline at end of file +define( '_MI_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); \ No newline at end of file diff --git a/html/modules/sitemap/language/fr_utf8/blocks.php b/html/modules/sitemap/language/fr_utf8/blocks.php index 18ac0d139..b5b53b325 100644 --- a/html/modules/sitemap/language/fr_utf8/blocks.php +++ b/html/modules/sitemap/language/fr_utf8/blocks.php @@ -4,3 +4,28 @@ define( '_MB_SITEMAP_OPENCLOSE' , 'Ouvrir - Fermer)'); define( '_MB_SITEMAP_COLS' , 'Colonnes'); + +// Block +define( '_MB_BLOCK_BLOCKNAME' , 'Plan du site'); +define( '_MB_BLOCK_BLOCKNAME_DESC' , 'Afficher le plan dans un bloc.'); + +define( '_MB_BLOCK_MAP' , 'Sitemap Map'); +define( '_MB_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); +// Options +define( '_MB_SHOW_SITENAME' , 'Show the site name'); +define( '_MB_SHOW_SITENAME_DESC' , 'Edit the site name in System »» Preferences »» Settings'); + +define( '_MB_SHOW_SLOGAN' , 'Show the site slogan'); +define( '_MB_SHOW_SLOGAN_DESC' , 'Edit the site slogan in System »» Preferences »» Settings'); + +define( '_MB_SHOW_MAP' , 'Show map'); +define( '_MB_SHOW_MAP_DESC' , 'DisplAy the embedded map in Sitemap page.'); + +define( '_MB_SHOW_MAP_CODE' , 'Embed Map HTML'); +define( '_MB_SHOW_MAP_CODE_DESC' , 'To integrate a Map ( e.g. Google Maps, OpenStreetMap), search for the location, click share and Embed a map, click Copy HTML. Default: width=100%, height=240'); + +define( '_MB_SHOW_ADDRESS' , 'Show adress'); +define( '_MB_SHOW_ADDRESS_DESC' , 'Display the contact address in Sitemap page.'); + +define( '_MB_SHOW_ADDRESS_CODE' , 'Contact adress'); +define( '_MB_SHOW_ADDRESS_CODE_DESC' , 'Use html tags "address" and "href=tel:" with the telephone number.'); \ No newline at end of file diff --git a/html/modules/sitemap/language/fr_utf8/modinfo.php b/html/modules/sitemap/language/fr_utf8/modinfo.php index 046925965..15b814665 100644 --- a/html/modules/sitemap/language/fr_utf8/modinfo.php +++ b/html/modules/sitemap/language/fr_utf8/modinfo.php @@ -28,27 +28,9 @@ define( '_MI_INVISIBLE_DIRNAMES' , 'Nom du répertoire des modules à cacher'); define( '_MI_INVISIBLE_DIRNAMESDSC' , "Spécifier le nom des modules qui doivent être cachés.
Les noms des répertoires doivent être séparés par une virgule.
ex: xoopsheadline,newbb "); -// Block +// Blocks define( '_MI_BLOCK_BLOCKNAME' , 'Plan du site'); define( '_MI_BLOCK_BLOCKNAME_DESC' , 'Afficher le plan dans un bloc.'); define( '_MI_BLOCK_MAP' , 'Sitemap Map'); -define( '_MI_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); -// Options -define( '_MI_SHOW_SITENAME' , 'Show the site name'); -define( '_MI_SHOW_SITENAME_DESC' , 'Edit the site name in System »» Preferences »» Settings'); - -define( '_MI_SHOW_SLOGAN' , 'Show the site slogan'); -define( '_MI_SHOW_SLOGAN_DESC' , 'Edit the site slogan in System »» Preferences »» Settings'); - -define( '_MI_SHOW_MAP' , 'Show map'); -define( '_MI_SHOW_MAP_DESC' , 'DisplAy the embedded map in Sitemap page.'); - -define( '_MI_SHOW_MAP_CODE' , 'Embed Map HTML'); -define( '_MI_SHOW_MAP_CODE_DESC' , 'To integrate a Map ( e.g. Google Maps, OpenStreetMap), search for the location, click share and Embed a map, click Copy HTML. Default: width=100%, height=240'); - -define( '_MI_SHOW_ADDRESS' , 'Show adress'); -define( '_MI_SHOW_ADDRESS_DESC' , 'Display the contact address in Sitemap page.'); - -define( '_MI_SHOW_ADDRESS_CODE' , 'Contact adress'); -define( '_MI_SHOW_ADDRESS_CODE_DESC' , 'Use html tags "address" and "href=tel:" with the telephone number.'); \ No newline at end of file +define( '_MI_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); \ No newline at end of file diff --git a/html/modules/sitemap/language/ja_utf8/blocks.php b/html/modules/sitemap/language/ja_utf8/blocks.php index 5864c8561..570993493 100644 --- a/html/modules/sitemap/language/ja_utf8/blocks.php +++ b/html/modules/sitemap/language/ja_utf8/blocks.php @@ -3,3 +3,28 @@ define( '_MB_SITEMAP_OPENCLOSE' , '開 - 閉'); define( '_MB_SITEMAP_COLS' , '列数'); + +// Block +define( '_MB_BLOCK_BLOCKNAME' , 'サイトマップ'); +define( '_MB_BLOCK_BLOCKNAME_DESC' , 'サイトマップをブロック表示する'); + +define( '_MB_BLOCK_MAP' , 'Sitemap Map'); +define( '_MB_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); +// Options +define( '_MB_SHOW_SITENAME' , 'Show the site name'); +define( '_MB_SHOW_SITENAME_DESC' , 'Edit the site name in System »» Preferences »» Settings'); + +define( '_MB_SHOW_SLOGAN' , 'Show the site slogan'); +define( '_MB_SHOW_SLOGAN_DESC' , 'Edit the site slogan in System »» Preferences »» Settings'); + +define( '_MB_SHOW_MAP' , 'Show map'); +define( '_MB_SHOW_MAP_DESC' , 'DisplAy the embedded map in Sitemap page.'); + +define( '_MB_SHOW_MAP_CODE' , 'Embed Map HTML'); +define( '_MB_SHOW_MAP_CODE_DESC' , 'To integrate a Map ( e.g. Google Maps, OpenStreetMap), search for the location, click share and Embed a map, click Copy HTML. Default: width=100%, height=240'); + +define( '_MB_SHOW_ADDRESS' , 'Show adress'); +define( '_MB_SHOW_ADDRESS_DESC' , 'Display the contact address in Sitemap page.'); + +define( '_MB_SHOW_ADDRESS_CODE' , 'Contact adress'); +define( '_MB_SHOW_ADDRESS_CODE_DESC' , 'Use html tags "address" and "href=tel:" with the telephone number.'); \ No newline at end of file diff --git a/html/modules/sitemap/language/ja_utf8/modinfo.php b/html/modules/sitemap/language/ja_utf8/modinfo.php index 57f58bad1..bba6ccf5a 100644 --- a/html/modules/sitemap/language/ja_utf8/modinfo.php +++ b/html/modules/sitemap/language/ja_utf8/modinfo.php @@ -32,22 +32,4 @@ define( '_MI_BLOCK_BLOCKNAME_DESC' , 'サイトマップをブロック表示する'); define( '_MI_BLOCK_MAP' , 'Sitemap Map'); -define( '_MI_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); -// Options -define( '_MI_SHOW_SITENAME' , 'Show the site name'); -define( '_MI_SHOW_SITENAME_DESC' , 'Edit the site name in System »» Preferences »» Settings'); - -define( '_MI_SHOW_SLOGAN' , 'Show the site slogan'); -define( '_MI_SHOW_SLOGAN_DESC' , 'Edit the site slogan in System »» Preferences »» Settings'); - -define( '_MI_SHOW_MAP' , 'Show map'); -define( '_MI_SHOW_MAP_DESC' , 'DisplAy the embedded map in Sitemap page.'); - -define( '_MI_SHOW_MAP_CODE' , 'Embed Map HTML'); -define( '_MI_SHOW_MAP_CODE_DESC' , 'To integrate a Map ( e.g. Google Maps, OpenStreetMap), search for the location, click share and Embed a map, click Copy HTML. Default: width=100%, height=240'); - -define( '_MI_SHOW_ADDRESS' , 'Show adress'); -define( '_MI_SHOW_ADDRESS_DESC' , 'Display the contact address in Sitemap page.'); - -define( '_MI_SHOW_ADDRESS_CODE' , 'Contact adress'); -define( '_MI_SHOW_ADDRESS_CODE_DESC' , 'Use html tags "address" and "href=tel:" with the telephone number.'); \ No newline at end of file +define( '_MI_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); \ No newline at end of file diff --git a/html/modules/sitemap/language/pt_utf8/blocks.php b/html/modules/sitemap/language/pt_utf8/blocks.php index 7c6b29f59..c6bbf284e 100644 --- a/html/modules/sitemap/language/pt_utf8/blocks.php +++ b/html/modules/sitemap/language/pt_utf8/blocks.php @@ -4,4 +4,28 @@ define( '_MB_SITEMAP_COLS' , 'Colunas'); +// Block +define( '_MB_BLOCK_BLOCKNAME' , 'Mapa do site'); +define( '_MB_BLOCK_BLOCKNAME_DESC' , 'Exibe o mapa do site em um bloco.'); + +define( '_MB_BLOCK_MAP' , 'Sitemap Map'); +define( '_MB_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); +// Options +define( '_MB_SHOW_SITENAME' , 'Show the site name'); +define( '_MB_SHOW_SITENAME_DESC' , 'Edit the site name in System »» Preferences »» Settings'); + +define( '_MB_SHOW_SLOGAN' , 'Show the site slogan'); +define( '_MB_SHOW_SLOGAN_DESC' , 'Edit the site slogan in System »» Preferences »» Settings'); + +define( '_MB_SHOW_MAP' , 'Show map'); +define( '_MB_SHOW_MAP_DESC' , 'DisplAy the embedded map in Sitemap page.'); + +define( '_MB_SHOW_MAP_CODE' , 'Embed Map HTML'); +define( '_MB_SHOW_MAP_CODE_DESC' , 'To integrate a Map ( e.g. Google Maps, OpenStreetMap), search for the location, click share and Embed a map, click Copy HTML. Default: width=100%, height=240'); + +define( '_MB_SHOW_ADDRESS' , 'Show adress'); +define( '_MB_SHOW_ADDRESS_DESC' , 'Display the contact address in Sitemap page.'); + +define( '_MB_SHOW_ADDRESS_CODE' , 'Contact adress'); +define( '_MB_SHOW_ADDRESS_CODE_DESC' , 'Use html tags "address" and "href=tel:" with the telephone number.'); diff --git a/html/modules/sitemap/language/pt_utf8/modinfo.php b/html/modules/sitemap/language/pt_utf8/modinfo.php index d1e382132..ca08beba0 100644 --- a/html/modules/sitemap/language/pt_utf8/modinfo.php +++ b/html/modules/sitemap/language/pt_utf8/modinfo.php @@ -33,22 +33,4 @@ define( '_MI_BLOCK_BLOCKNAME_DESC' , 'Exibe o mapa do site em um bloco.'); define( '_MI_BLOCK_MAP' , 'Sitemap Map'); -define( '_MI_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); -// Options -define( '_MI_SHOW_SITENAME' , 'Show the site name'); -define( '_MI_SHOW_SITENAME_DESC' , 'Edit the site name in System »» Preferences »» Settings'); - -define( '_MI_SHOW_SLOGAN' , 'Show the site slogan'); -define( '_MI_SHOW_SLOGAN_DESC' , 'Edit the site slogan in System »» Preferences »» Settings'); - -define( '_MI_SHOW_MAP' , 'Show map'); -define( '_MI_SHOW_MAP_DESC' , 'DisplAy the embedded map in Sitemap page.'); - -define( '_MI_SHOW_MAP_CODE' , 'Embed Map HTML'); -define( '_MI_SHOW_MAP_CODE_DESC' , 'To integrate a Map ( e.g. Google Maps, OpenStreetMap), search for the location, click share and Embed a map, click Copy HTML. Default: width=100%, height=240'); - -define( '_MI_SHOW_ADDRESS' , 'Show adress'); -define( '_MI_SHOW_ADDRESS_DESC' , 'Display the contact address in Sitemap page.'); - -define( '_MI_SHOW_ADDRESS_CODE' , 'Contact adress'); -define( '_MI_SHOW_ADDRESS_CODE_DESC' , 'Use html tags "address" and "href=tel:" with the telephone number.'); \ No newline at end of file +define( '_MI_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); \ No newline at end of file diff --git a/html/modules/sitemap/language/ru_utf8/blocks.php b/html/modules/sitemap/language/ru_utf8/blocks.php index 57a67b4f8..75f1e9bca 100644 --- a/html/modules/sitemap/language/ru_utf8/blocks.php +++ b/html/modules/sitemap/language/ru_utf8/blocks.php @@ -3,3 +3,28 @@ define( '_MB_SITEMAP_OPENCLOSE' , 'Открыто закрыто'); define( '_MB_SITEMAP_COLS' , 'столбцы'); + +// Block +define( '_MB_BLOCK_BLOCKNAME' , 'Карта сайта'); +define( '_MB_BLOCK_BLOCKNAME_DESC' , 'Показать карту сайта в виде блока.'); + +define( '_MB_BLOCK_MAP' , 'Sitemap Map'); +define( '_MB_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); +// Options +define( '_MB_SHOW_SITENAME' , 'Show the site name'); +define( '_MB_SHOW_SITENAME_DESC' , 'Edit the site name in System »» Preferences »» Settings'); + +define( '_MB_SHOW_SLOGAN' , 'Show the site slogan'); +define( '_MB_SHOW_SLOGAN_DESC' , 'Edit the site slogan in System »» Preferences »» Settings'); + +define( '_MB_SHOW_MAP' , 'Show map'); +define( '_MB_SHOW_MAP_DESC' , 'DisplAy the embedded map in Sitemap page.'); + +define( '_MB_SHOW_MAP_CODE' , 'Embed Map HTML'); +define( '_MB_SHOW_MAP_CODE_DESC' , 'To integrate a Map ( e.g. Google Maps, OpenStreetMap), search for the location, click share and Embed a map, click Copy HTML. Default: width=100%, height=240'); + +define( '_MB_SHOW_ADDRESS' , 'Show adress'); +define( '_MB_SHOW_ADDRESS_DESC' , 'Display the contact address in Sitemap page.'); + +define( '_MB_SHOW_ADDRESS_CODE' , 'Contact adress'); +define( '_MB_SHOW_ADDRESS_CODE_DESC' , 'Use html tags "address" and "href=tel:" with the telephone number.'); \ No newline at end of file diff --git a/html/modules/sitemap/language/ru_utf8/modinfo.php b/html/modules/sitemap/language/ru_utf8/modinfo.php index 198465b0e..f99659803 100644 --- a/html/modules/sitemap/language/ru_utf8/modinfo.php +++ b/html/modules/sitemap/language/ru_utf8/modinfo.php @@ -33,22 +33,4 @@ define( '_MI_BLOCK_BLOCKNAME_DESC' , 'Показать карту сайта в виде блока.'); define( '_MI_BLOCK_MAP' , 'Sitemap Map'); -define( '_MI_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); -// Options -define( '_MI_SHOW_SITENAME' , 'Show the site name'); -define( '_MI_SHOW_SITENAME_DESC' , 'Edit the site name in System »» Preferences »» Settings'); - -define( '_MI_SHOW_SLOGAN' , 'Show the site slogan'); -define( '_MI_SHOW_SLOGAN_DESC' , 'Edit the site slogan in System »» Preferences »» Settings'); - -define( '_MI_SHOW_MAP' , 'Show map'); -define( '_MI_SHOW_MAP_DESC' , 'DisplAy the embedded map in Sitemap page.'); - -define( '_MI_SHOW_MAP_CODE' , 'Embed Map HTML'); -define( '_MI_SHOW_MAP_CODE_DESC' , 'To integrate a Map ( e.g. Google Maps, OpenStreetMap), search for the location, click share and Embed a map, click Copy HTML. Default: width=100%, height=240'); - -define( '_MI_SHOW_ADDRESS' , 'Show adress'); -define( '_MI_SHOW_ADDRESS_DESC' , 'Display the contact address in Sitemap page.'); - -define( '_MI_SHOW_ADDRESS_CODE' , 'Contact adress'); -define( '_MI_SHOW_ADDRESS_CODE_DESC' , 'Use html tags "address" and "href=tel:" with the telephone number.'); \ No newline at end of file +define( '_MI_BLOCK_MAP_DESC' , 'Use the Map block to display an interactive map.'); \ No newline at end of file diff --git a/html/modules/sitemap/xoops_version.php b/html/modules/sitemap/xoops_version.php index f5bfe75fe..99add6751 100644 --- a/html/modules/sitemap/xoops_version.php +++ b/html/modules/sitemap/xoops_version.php @@ -12,7 +12,7 @@ // Manifesto $modversion['dirname'] = 'sitemap'; -$modversion['name'] = _MD_SITEMAP_NAME; +$modversion['name'] = _MI_SITEMAP_NAME; $modversion['version'] = '2.40'; $modversion['detailed_version'] = '2.40.0'; $modversion['description'] = _MI_SITEMAP_DESC; diff --git a/html/themes/bs5-starter/CHANGELOG.md b/html/themes/bs5-starter/CHANGELOG.md index bded8258c..61f73126d 100644 --- a/html/themes/bs5-starter/CHANGELOG.md +++ b/html/themes/bs5-starter/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to XCL Theme Bootstrap 5.3 Starter will be documented in thi Git Repository : Refer please to [Branch Legacy ](https://github.com/xoopscube-themes/xcl-bootstrap5) + ## [240rc] 2024-04-20 - Update to Bootstrap v5.3.3 diff --git a/html/themes/xcl_default/component/_inc_top_center.html b/html/themes/xcl_default/component/_inc_top_center.html index f315ae047..83861bbe4 100644 --- a/html/themes/xcl_default/component/_inc_top_center.html +++ b/html/themes/xcl_default/component/_inc_top_center.html @@ -80,7 +80,7 @@

<{$xoops_slogan}>

<{* ---------- BLOCK Center-Left *}> -<{if $xoops_clblocks}> +<{if isset($xoops_clblocks)}>
<{foreach item=block from=$xoops_clblocks}> <{if $block.title|strstr:"top-"}> @@ -101,7 +101,7 @@

<{/if}> <{* ---------- BLOCK Center-Center *}> -<{if $xoops_ccblocks}> +<{if isset($xoops_ccblocks)}>
<{foreach item=block from=$xoops_ccblocks}> <{if $block.title|strstr:"top-"}> @@ -122,7 +122,7 @@

<{/if}> <{* ---------- BLOCK Center-Right *}> -<{if $xoops_crblocks}> +<{if isset($xoops_crblocks)}>
<{foreach item=block from=$xoops_crblocks}> <{if $block.title|strstr:"top-"}> diff --git a/html/themes/xcl_default/theme.html b/html/themes/xcl_default/theme.html index 9acfca4a3..87f69e803 100644 --- a/html/themes/xcl_default/theme.html +++ b/html/themes/xcl_default/theme.html @@ -129,7 +129,7 @@ <{if $xoops_is_top|default:''}> <{* SHOW BLOCKS CENTER-L-C-R WITH A BLOCK TITLE PREFIXED BY "top-" *}> -<{if $xoops_clblocks or $xoops_ccblocks or $xoops_crblocks}> +<{if isset($xoops_clblocks) or isset($xoops_ccblocks) or isset($xoops_crblocks)}> <{include file="$xoops_theme/component/_inc_top_center.html"}> <{/if}> diff --git a/html/xoops.css b/html/xoops.css deleted file mode 100644 index afd3b4aaf..000000000 --- a/html/xoops.css +++ /dev/null @@ -1,17 +0,0 @@ -img {border: 0;} - -#xoopsHiddenText {visibility: hidden; color: #000000; font-weight: normal; font-style: normal; text-decoration: none;} - -.pagneutral {font-size: 10px; width: 16px; height: 19px;text-align: center; background-image: url(./images/icons/file-view.svg);} -.pagact {font-size: 10px; width: 16px; height: 19px;text-align: center; background-image: url(./images/icons/file-view.svg);} -.paginact {font-size: 10px; width: 16px; height: 19px;text-align: center; background-image: url(./images/icons/file-view.svg);} - - -#mainmenu a {text-align:left; display: block; margin: 0; padding: 4px;} -#mainmenu a.menuTop {padding-left: 3px;} -#mainmenu a.menuMain {padding-left: 3px;} -#mainmenu a.menuSub {padding-left: 9px;} - -#usermenu a {text-align:left; display: block; margin: 0; padding: 4px;} -#usermenu a.menuTop {} -#usermenu a.highlight {color: #0000ff; background-color: #fcc;} diff --git a/xoops_trust_path/libs/altsys/language/fr_utf8/compilehookadmin.php b/xoops_trust_path/libs/altsys/language/fr_utf8/compilehookadmin.php index 4388c035a..6c73024de 100644 --- a/xoops_trust_path/libs/altsys/language/fr_utf8/compilehookadmin.php +++ b/xoops_trust_path/libs/altsys/language/fr_utf8/compilehookadmin.php @@ -19,8 +19,8 @@
  • générer le code d'application utilisé dans les modèles et collecter les variables Smarty.
    • "); -define( '_TPLSADMIN_CACHE_TITLE', 'modèle compilé'); -define( '_TPLSADMIN_CACHE_DESC' , 'le modèle source reste inchangé, dans la plupart des cas, vous pouvez supprimer tous les fichiers de modèle mis en cache et exécuter Normaliser. La compilation génère un nouvel ensemble de fichiers. ' ); +define( '_TPLSADMIN_CACHE_TITLE', 'Modèles compilés'); +define( '_TPLSADMIN_CACHE_DESC' , 'Le modèle source reste inchangé. Dans la plupart des cas, vous pouvez supprimer tous les fichiers en cache et exécuter Normaliser. La compilation génère un nouvel ensemble de fichiers.' ); define( '_TPLSADMIN_FMT_MSG_ENCLOSEBYCOMMENT' , '%d modèles en cache sont entourés de commentaires tplsadmin.'); define( '_TPLSADMIN_DT_ENCLOSEBYCOMMENT' , 'Ajouter des commentaires au code source'); @@ -28,27 +28,27 @@ define( '_TPLSADMIN_CNF_ENCLOSEBYCOMMENT' , 'Ajoutez un commentaire "tplsadmin" aux modèles compilés mis en cache. Confirmez pour continuer ou annulez !'); define( '_TPLSADMIN_FMT_MSG_ENCLOSEBYBORDEREDDIV' , '%d modèles en cache sont entourés de balises div.l'); -define( '_TPLSADMIN_DT_ENCLOSEBYBORDEREDDIV' , 'Ajoutez des balises div autour des modèles.'); +define( '_TPLSADMIN_DT_ENCLOSEBYBORDEREDDIV' , 'Ajouter des balises div autour des modèles.'); define( '_TPLSADMIN_DD_ENCLOSEBYBORDEREDDIV' , "Chaque modèle est entouré d'une balise div et d'un lien vers le contrôleur d'édition. Bien que cela affecte la conception globale, vous pouvez facilement identifier le modèle que vous souhaitez modifier."); define( '_TPLSADMIN_CNF_ENCLOSEBYBORDEREDDIV' , 'Enveloppez les modèles mis en cache avec des balises div. Confirmer pour continuer ou annuler !'); define( '_TPLSADMIN_FMT_MSG_HOOKSAVEVARS' , '%d logique implémentée dans le cache compilé pour collecter les variables des modèles.'); define( '_TPLSADMIN_DT_HOOKSAVEVARS' , 'Insérer la logique pour collecter des variables de modèle'); -define( '_TPLSADMIN_DD_HOOKSAVEVARS' , "Etape préliminaire pour obtenir une liste d'informations sur les variables de modèle. En injectant de la logique dans le cache des modèles compilés et en rendant chaque page, les informations sur les variables de modèle sont sauvegardés. Obtenez des informations sur le bouton ci-dessous au bon moment. Videz le cache de compilation lors de la suppression de cette logique."); -define( '_TPLSADMIN_CNF_HOOKSAVEVARS' , 'Les modèles compilés dans le cache, implémenteront la logique pour collecter les variables de modèle. Voulez-vous continuer?'); +define( '_TPLSADMIN_DD_HOOKSAVEVARS' , "Cette fonction permet d'obtenir une liste d'informations sur les variables de modèle. En injectant de la logique dans le cache des modèles compilés, les informations sur les variables de modèle sont sauvegardés lors du rendu de chaque page. Videz le cache de compilation pour supprimer cette fonction."); +define( '_TPLSADMIN_CNF_HOOKSAVEVARS' , 'Implémenter la logique pour collecter les variables du modèle. Confirmez pour continuer!'); define( '_TPLSADMIN_FMT_MSG_REMOVEHOOKS' , '%d templates mis en cache sont normalisés !'); define( '_TPLSADMIN_DT_REMOVEHOOKS' , 'Normaliser les modèles compilés.'); -define( '_TPLSADMIN_DD_REMOVEHOOKS' , 'Cela supprime les commentaires, les balises div et la logique Smarty de tous les modèles compilés.'); -define( '_TPLSADMIN_CNF_REMOVEHOOKS' , 'Normaliser les modèles compilés. Confirmez pour continuer ou annulez !'); +define( '_TPLSADMIN_DD_REMOVEHOOKS' , 'Supprimer les commentaires, les balises div et la logique Smarty de tous les modèles compilés.'); +define( '_TPLSADMIN_CNF_REMOVEHOOKS' , 'Normaliser les modèles compilés. Confirmez pour continuer ou annulez!'); define( '_TPLSADMIN_MSG_CLEARCACHE' , 'Les modèles en cache ont été supprimés !'); define( '_TPLSADMIN_MSG_CREATECOMPILECACHEFIRST' , "Il n'y a pas de modèles compilés. Parcourez votre front-end pour afficher vos pages et mettre en cache les modèles compilés."); define( '_TPLSADMIN_CNF_DELETEOK' , 'Confirmez pour supprimer ou annulez !'); -define( '_TPLSADMIN_DT_GETTPLSVARSINFO_DW' , "Générer l'extension DreamWeaver avec des variables de modèle."); -define( '_TPLSADMIN_DD_GETTPLSVARSINFO_DW' , "Ouvrir d'abord le gestionnaire d'extensions.
    Extraire l'archive de téléchargement.
    Exécutez les fichiers avec les extensions .mxi et suivez les instructions d'installation des boîtes de dialogue.
    Les extraits de variables de modèle de votre site seront utilisables après le redémarrage de DreamWeaver."); +define( '_TPLSADMIN_DT_GETTPLSVARSINFO_DW' , "Générer une extension DreamWeaver avec les variables des modèles."); +define( '_TPLSADMIN_DD_GETTPLSVARSINFO_DW' , "Ouvrir d'abord le gestionnaire d'extensions.
    Extraire l'archive de téléchargement.
    Exécutez les fichiers avec les extensions .mxi et suivez les instructions d'installation des boîtes de dialogue.
    L'extension avec les variables des modèles sera disponible après le redémarrage de DreamWeaver."); define( '_TPLSADMIN_DT_GETTEMPLATES' , 'Télécharger templates'); define( '_TPLSADMIN_DD_GETTEMPLATES' , "Sélectionnez un ensemble de modèles à télécharger et appuyez sur l'un des boutons."); diff --git a/xoops_trust_path/modules/d3forum/language/fr_utf8/main.php b/xoops_trust_path/modules/d3forum/language/fr_utf8/main.php index 823002447..166bdf753 100644 --- a/xoops_trust_path/modules/d3forum/language/fr_utf8/main.php +++ b/xoops_trust_path/modules/d3forum/language/fr_utf8/main.php @@ -64,7 +64,7 @@ Define( '_MD_D3FORUM_MSG_CONFIRMDELETE' , 'Confirmer la suppression ?'); Define( '_MD_D3FORUM_MSG_CONFIRMDELETERECURSIVE' , 'Toutes les données attachées seront également effacées. Confirmer la suppression ?'); Define( '_MD_D3FORUM_POSTASNEWTOPIC' , 'Créer un nouveau Sujet'); -Define( '_MD_D3FORUM_POSTASNEWTOPICTOTHISFORUM' , 'Vous pouvez créer un nouveau Sujet dans ce Forum'); +Define( '_MD_D3FORUM_POSTASNEWTOPICTOTHISFORUM' , 'Nouveau Sujet dans ce Forum'); Define( '_MD_D3FORUM_POSTASSAMETOPIC' , 'Poster dans ce sujet'); Define( '_MD_D3FORUM_REPLYTHISPOST' , 'Répondre à ce post.'); Define( '_MD_D3FORUM_CANTPOSTTHISFORUM' , 'Vous ne pouvez pas poster dans ce Forum'); @@ -72,7 +72,7 @@ Define( '_MD_D3FORUM_GUESTSCANPOST_DESC' , 'Les utilisateurs invités peuvent poster dans ce Forum'); Define( '_MD_D3FORUM_GUESTSCANNOTPOST_DESC' , 'Les utilisateurs invités ne peuvent pas poster dans ce Forum'); Define( '_MD_D3FORUM_FORUMASCOMMENT' , 'Forum comme les commentaires'); -Define( '_MD_D3FORUM_FORUMASCOMMENT_DESC' , 'Ce Forum est réservé aux commentaires seulement, vous ne pouvez pas créer un nouveau Sujet'); +Define( '_MD_D3FORUM_FORUMASCOMMENT_DESC' , 'Ce forum est réservé aux commentaires, vous ne pouvez pas créer de nouveau sujet'); Define( '_MD_D3FORUM_ERR_FORUMASCOMMENT' , 'Vous ne pouvez pas créer directement un nouveau Sujet dans ce Forum.'); Define( '_MD_D3FORUM_ERR_INVALIDEXTERNALLINKID' , 'Vous avez commenté une cible non valide'); Define( '_MD_D3FORUM_REPLIES' , 'Réponses');