Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10965] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules /system
|
From: <tr...@us...> - 2013-02-01 22:33:08
|
Revision: 10965
http://sourceforge.net/p/xoops/svn/10965
Author: trabis
Date: 2013-02-01 22:33:03 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Updating locale for system blocks
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/info.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/login.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/newmembers.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/themes.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/topposters.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_blocks.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/info.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/info.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/info.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -65,16 +65,16 @@
$block['showgroups'] = false;
}
$block['logourl'] = XOOPS_URL . '/images/' . $options[2];
- $block['recommendlink'] = "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . "/misc.php?action=showpopups&type=friend&op=sendform&t=" . time() . "','friend'," . $options[0] . "," . $options[1] . ")\">" . _MB_SYSTEM_RECO . "</a>";
+ $block['recommendlink'] = "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . "/misc.php?action=showpopups&type=friend&op=sendform&t=" . time() . "','friend'," . $options[0] . "," . $options[1] . ")\">" . SystemLocale::RECOMMEND_US . "</a>";
return $block;
}
function b_system_info_edit($options)
{
$block_form = new XoopsBlockForm();
- $block_form->addElement( new XoopsFormText(_MB_SYSTEM_PWWIDTH, 'options[0]', 1, 3, $options[0]), true);
- $block_form->addElement( new XoopsFormText(_MB_SYSTEM_PWHEIGHT, 'options[1]', 1, 3, $options[1]), true);
- $block_form->addElement( new XoopsFormText(sprintf(_MB_SYSTEM_LOGO, XOOPS_URL . "/images/"), 'options[2]', 5, 100, $options[2]), true);
- $block_form->addElement(new XoopsFormRadioYN(_MB_SYSTEM_SADMIN, 'options[3]', $options[3]));
+ $block_form->addElement( new XoopsFormText(SystemLocale::POPUP_WINDOW_WIDTH, 'options[0]', 1, 3, $options[0]), true);
+ $block_form->addElement( new XoopsFormText(SystemLocale::POPUP_WINDOW_HEIGHT, 'options[1]', 1, 3, $options[1]), true);
+ $block_form->addElement( new XoopsFormText(sprintf(SystemLocale::F_LOGO_IMAGE_FILE_IS_LOCATED_UNDER, XOOPS_URL . "/images/"), 'options[2]', 5, 100, $options[2]), true);
+ $block_form->addElement(new XoopsFormRadioYN(SystemLocale::SHOW_ADMIN_GROUPS, 'options[3]', $options[3]));
return $block_form->render();
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/login.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/login.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/login.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -28,13 +28,12 @@
$block['unamevalue'] = "";
$block['lang_password'] = XoopsLocale::C_PASSWORD;
$block['lang_login'] = XoopsLocale::A_LOGIN;
- $block['lang_lostpass'] = _MB_SYSTEM_LPASS;
- $block['lang_registernow'] = _MB_SYSTEM_RNOW;
- //$block['lang_rememberme'] = _MB_SYSTEM_REMEMBERME;
+ $block['lang_lostpass'] = XoopsLocale::Q_LOST_YOUR_PASSWORD;
+ $block['lang_registernow'] = XoopsLocale::REGISTER_NOW;
if ($xoops->getConfig('use_ssl') == 1 && $xoops->getConfig('sslloginlink') != '') {
- $block['sslloginlink'] = "<a href=\"javascript:openWithSelfMain('" . $xoops->getConfig('sslloginlink') . "', 'ssllogin', 300, 200);\">" . _MB_SYSTEM_SECURE . "</a>";
+ $block['sslloginlink'] = "<a href=\"javascript:openWithSelfMain('" . $xoops->getConfig('sslloginlink') . "', 'ssllogin', 300, 200);\">" . SystemLocale::SECURE_LOGIN . "</a>";
} elseif ($xoops->getConfig('usercookie')) {
- $block['lang_rememberme'] = _MB_SYSTEM_REMEMBERME;
+ $block['lang_rememberme'] = XoopsLocale::REMEMBER_ME;
}
return $block;
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -23,7 +23,7 @@
{
$xoops = Xoops::getInstance();
$block = array();
- $block['lang_home'] = _MB_SYSTEM_HOME;
+ $block['lang_home'] = XoopsLocale::HOME;
$block['lang_close'] = XoopsLocale::A_CLOSE;
$module_handler = $xoops->getHandlerModule();
$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/newmembers.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/newmembers.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/newmembers.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -51,7 +51,7 @@
function b_system_newmembers_edit($options)
{
$block_form = new XoopsBlockForm();
- $block_form->addElement( new XoopsFormText(_MB_SYSTEM_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
- $block_form->addElement(new XoopsFormRadioYN(_MB_SYSTEM_DISPLAYA, 'options[1]', $options[1]));
+ $block_form->addElement( new XoopsFormText(SystemLocale::NUMBER_OF_MEMBERS_TO_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
+ $block_form->addElement(new XoopsFormRadioYN(SystemLocale::DISPLAY_MEMBERS_AVATARS, 'options[1]', $options[1]));
return $block_form->render();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/themes.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/themes.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/themes.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -38,14 +38,14 @@
$block['theme_select'] = '<select class="span2" name="xoops_theme_select" onchange="submit();" size="3">' . $theme_options . '</select>';
}
- $block['theme_select'] .= '<br />(' . sprintf(_MB_SYSTEM_NUMTHEME, '<strong>' . count($theme_set_allowed) . '</strong>') . ')<br />';
+ $block['theme_select'] .= '<br />(' . sprintf(SystemLocale::F_THEMES, '<strong>' . count($theme_set_allowed) . '</strong>') . ')<br />';
return $block;
}
function b_system_themes_edit($options)
{
$block_form = new XoopsBlockForm();
- $block_form->addElement(new XoopsFormRadioYN(_MB_SYSTEM_THSHOW, 'options[0]', $options[0]));
- $block_form->addElement( new XoopsFormText(_MB_SYSTEM_THWIDTH, 'options[1]', 1, 3, $options[1]), true);
+ $block_form->addElement(new XoopsFormRadioYN(SystemLocale::DISPLAY_SCREENSHOT_IMAGE, 'options[0]', $options[0]));
+ $block_form->addElement( new XoopsFormText(SystemLocale::SCREENSHOT_IMAGE_WIDTH, 'options[1]', 1, 3, $options[1]), true);
return $block_form->render();
}
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/topposters.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/topposters.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/topposters.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -51,14 +51,12 @@
function b_system_topposters_edit($options)
{
- include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-
$block_form = new XoopsBlockForm();
- $block_form->addElement( new XoopsFormText(_MB_SYSTEM_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
- $block_form->addElement(new XoopsFormRadioYN(_MB_SYSTEM_DISPLAYA, 'options[1]', $options[1]));
+ $block_form->addElement( new XoopsFormText(SystemLocale::NUMBER_OF_MEMBERS_TO_DISPLAY, 'options[0]', 1, 3, $options[0]), true);
+ $block_form->addElement(new XoopsFormRadioYN(SystemLocale::DISPLAY_MEMBERS_AVATARS, 'options[1]', $options[1]));
$ranks = XoopsLists::getUserRankList();
- $ranks_select = new XoopsFormSelect(_MB_SYSTEM_NODISPGR, 'options[2]', explode(',',$options[2]), 5, true);
+ $ranks_select = new XoopsFormSelect(SystemLocale::C_DO_NOT_DISPLAY_USERS_WHOSE_RANK_IS, 'options[2]', explode(',',$options[2]), 5, true);
$ranks_select->addOptionArray( $ranks );
$block_form->addElement($ranks_select);
return $block_form->render();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -61,14 +61,14 @@
// View Account
array_unshift($block['modules'], array(
- 'name' => _MB_SYSTEM_VACNT,
+ 'name' => SystemLocale::VIEW_ACCOUNT,
'link' => $xoops->url('userinfo.php?uid=' . $xoops->user->getVar('uid')),
'icon' => 'icon-user',
));
// Edit Account
array_unshift($block['modules'], array(
- 'name' => _MB_SYSTEM_EACNT,
+ 'name' => SystemLocale::EDIT_ACCOUNT,
'link' => $xoops->url('edituser.php'),
'icon' => 'icon-user',
));
@@ -76,7 +76,7 @@
// Administration Menu
if ($xoops->isAdmin()) {
array_unshift($block['modules'], array(
- 'name' => _MB_SYSTEM_ADMENU,
+ 'name' => SystemLocale::ADMINISTRATION_MENU,
'link' => $xoops->url('admin.php'),
'rel' => 'external',
'icon' => 'icon-wrench',
@@ -89,10 +89,10 @@
$pm_handler = $xoops->getHandlerPrivmessage();
$xoops->preload()->triggerEvent('system.blocks.system_blocks.usershow', array(&$pm_handler));
- $name = _MB_SYSTEM_INBOX;
+ $name = XoopsLocale::INBOX;
$class = '';
if ($pm_count = $pm_handler->getCount($criteria)) {
- $name = _MB_SYSTEM_INBOX . ' <strong>' . $pm_count . '</strong>';
+ $name = XoopsLocale::INBOX . ' <strong>' . $pm_count . '</strong>';
$class = 'highlight';
}
@@ -105,7 +105,7 @@
// Logout
array_push($block['modules'], array(
- 'name' => _MB_SYSTEM_LOUT,
+ 'name' => XoopsLocale::A_LOGOUT,
'link' => $xoops->url('user.php?op=logout'),
'icon' => 'icon-off',
));
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_blocks.php (from rev 10963, XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_blocks.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_blocks.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -0,0 +1,52 @@
+<?php
+// $Id$
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+
+// Blocks
+//define("_MB_SYSTEM_ADMENU","Administration Menu");
+//define("_MB_SYSTEM_RNOW","Register now!");
+//define("_MB_SYSTEM_LPASS","Lost Password?");
+//define("_MB_SYSTEM_SEARCH","Search");
+//define("_MB_SYSTEM_ADVS","Advanced Search");
+//define("_MB_SYSTEM_VACNT","View Account");
+//define("_MB_SYSTEM_EACNT","Edit Account");
+//define("_MB_SYSTEM_USERCONFIGS","User configs");
+// RMV-NOTIFY
+//define("_MB_SYSTEM_NOTIF", "Notifications");
+//define("_MB_SYSTEM_LOUT","Logout");
+//define("_MB_SYSTEM_INBOX","Inbox");
+//define("_MB_SYSTEM_SUBMS","Submitted News");
+//define("_MB_SYSTEM_WLNKS","Waiting Links");
+//define("_MB_SYSTEM_BLNK","Broken Links");
+//define("_MB_SYSTEM_MLNKS","Modified Links");
+//define("_MB_SYSTEM_WDLS","Waiting Downloads");
+//define("_MB_SYSTEM_BFLS","Broken Files");
+//define("_MB_SYSTEM_MFLS","Modified Downloads");
+//define("_MB_SYSTEM_TDMDOWNLOADS","Waiting Downloads");
+//define("_MB_SYSTEM_EXTGALLERY","Waiting Photos");
+//define("_MB_SYSTEM_SMARTSECTION","Articles");
+//define("_MB_SYSTEM_HOME","Home"); // link to home page in main menu block
+//define("_MB_SYSTEM_RECO","Recommend Us");
+//define("_MB_SYSTEM_PWWIDTH","Pop-Up Window Width");
+//define("_MB_SYSTEM_PWHEIGHT","Pop-Up Window Height");
+//define("_MB_SYSTEM_LOGO","Logo image file is located under %s directory"); // %s is your root image directory name
+//define("_MB_SYSTEM_COMPEND", "Comments");
+
+//define("_MB_SYSTEM_LOGGEDINAS", "Logged in as");
+//define("_MB_SYSTEM_SADMIN","Show admin groups");
+//define("_MB_SYSTEM_SPMTO","Send Private Message to %s");
+//define("_MB_SYSTEM_SEMTO","Send Email to %s");
+
+//define("_MB_SYSTEM_DISPLAY","Number of members to display");
+//define("_MB_SYSTEM_DISPLAYA","Display member avatars");
+//define("_MB_SYSTEM_NODISPGR","Do not display users whose rank is:");
+
+//define("_MB_SYSTEM_DISPLAYC","Number of comments to display");
+//define("_MB_SYSTEM_SECURE", "Secure Login");
+
+//define("_MB_SYSTEM_NUMTHEME", "%s themes");
+//define("_MB_SYSTEM_THSHOW", "Display screenshot image");
+//define("_MB_SYSTEM_THWIDTH", "Screenshot image width");
+define("_MB_SYSTEM_REMEMBERME","Remember me");
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php 2013-02-01 22:17:28 UTC (rev 10964)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/blocks.php 2013-02-01 22:33:03 UTC (rev 10965)
@@ -1,52 +0,0 @@
-<?php
-// $Id$
-// _LANGCODE: en
-// _CHARSET : UTF-8
-// Translator: XOOPS Translation Team
-
-// Blocks
-define("_MB_SYSTEM_ADMENU","Administration Menu");
-define("_MB_SYSTEM_RNOW","Register now!");
-define("_MB_SYSTEM_LPASS","Lost Password?");
-//define("_MB_SYSTEM_SEARCH","Search");
-//define("_MB_SYSTEM_ADVS","Advanced Search");
-define("_MB_SYSTEM_VACNT","View Account");
-define("_MB_SYSTEM_EACNT","Edit Account");
-//define("_MB_SYSTEM_USERCONFIGS","User configs");
-// RMV-NOTIFY
-//define("_MB_SYSTEM_NOTIF", "Notifications");
-define("_MB_SYSTEM_LOUT","Logout");
-define("_MB_SYSTEM_INBOX","Inbox");
-//define("_MB_SYSTEM_SUBMS","Submitted News");
-//define("_MB_SYSTEM_WLNKS","Waiting Links");
-//define("_MB_SYSTEM_BLNK","Broken Links");
-//define("_MB_SYSTEM_MLNKS","Modified Links");
-//define("_MB_SYSTEM_WDLS","Waiting Downloads");
-//define("_MB_SYSTEM_BFLS","Broken Files");
-//define("_MB_SYSTEM_MFLS","Modified Downloads");
-//define("_MB_SYSTEM_TDMDOWNLOADS","Waiting Downloads");
-//define("_MB_SYSTEM_EXTGALLERY","Waiting Photos");
-//define("_MB_SYSTEM_SMARTSECTION","Articles");
-define("_MB_SYSTEM_HOME","Home"); // link to home page in main menu block
-define("_MB_SYSTEM_RECO","Recommend Us");
-define("_MB_SYSTEM_PWWIDTH","Pop-Up Window Width");
-define("_MB_SYSTEM_PWHEIGHT","Pop-Up Window Height");
-define("_MB_SYSTEM_LOGO","Logo image file is located under %s directory"); // %s is your root image directory name
-//define("_MB_SYSTEM_COMPEND", "Comments");
-
-//define("_MB_SYSTEM_LOGGEDINAS", "Logged in as");
-define("_MB_SYSTEM_SADMIN","Show admin groups");
-//define("_MB_SYSTEM_SPMTO","Send Private Message to %s");
-//define("_MB_SYSTEM_SEMTO","Send Email to %s");
-
-define("_MB_SYSTEM_DISPLAY","Number of members to display");
-define("_MB_SYSTEM_DISPLAYA","Display member avatars");
-define("_MB_SYSTEM_NODISPGR","Do not display users whose rank is:");
-
-//define("_MB_SYSTEM_DISPLAYC","Number of comments to display");
-define("_MB_SYSTEM_SECURE", "Secure Login");
-
-define("_MB_SYSTEM_NUMTHEME", "%s themes");
-define("_MB_SYSTEM_THSHOW", "Display screenshot image");
-define("_MB_SYSTEM_THWIDTH", "Screenshot image width");
-define("_MB_SYSTEM_REMEMBERME","Remember me");
\ No newline at end of file
|
