Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10964] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules /system
|
From: <tr...@us...> - 2013-02-01 22:18:01
|
Revision: 10964
http://sourceforge.net/p/xoops/svn/10964
Author: trabis
Date: 2013-02-01 22:17:28 +0000 (Fri, 01 Feb 2013)
Log Message:
-----------
Adding locale to system xoops_version and preferences page
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/functions.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/locale/en_US/en_US.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
Added Paths:
-----------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_modinfo.php
Removed Paths:
-------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/admin/preferences/main.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -78,7 +78,7 @@
// Define Breadcrumb and tips
$admin_page = new XoopsModuleAdmin();
$admin_page->addBreadcrumbLink(_AM_SYSTEM_CPANEL, XOOPS_URL . '/admin.php', true);
- $admin_page->addBreadcrumbLink(_AM_SYSTEM_PREFERENCES_NAV_MAIN, $system->adminVersion('extensions', 'adminpath'));
+ $admin_page->addBreadcrumbLink(XoopsLocale::PREFERENCES, $system->adminVersion('extensions', 'adminpath'));
$admin_page->addBreadcrumbLink($module->getVar('name'));
$admin_page->renderBreadcrumb();
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preferences.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -57,7 +57,7 @@
if (!$configCats) {
$configCats = array(
'default' => array(
- 'name' => _MD_AM_MODCONFIG,
+ 'name' => SystemLocale::OTHER_SETTINGS,
'description' => ''
)
);
@@ -65,7 +65,7 @@
if (!in_array('default', array_keys($configCats))) {
$configCats['default'] = array(
- 'name' => _MD_AM_MODCONFIG,
+ 'name' => SystemLocale::OTHER_SETTINGS,
'description' => ''
);
}
@@ -114,8 +114,8 @@
$options = $config_handler->getConfigOptions(new Criteria('conf_id', $obj[$i]->getVar('conf_id')));
$opcount = count($options);
for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+ $optval = Xoops_Locale::translate($options[$j]->getVar('confop_value'), $mod->getVar('dirname'));
+ $optkey = Xoops_Locale::translate($options[$j]->getVar('confop_name'), $mod->getVar('dirname'));
$ele->addOption($optval, $optkey);
}
break;
@@ -125,8 +125,8 @@
$options = $config_handler->getConfigOptions(new Criteria('conf_id', $obj[$i]->getVar('conf_id')));
$opcount = count($options);
for ($j = 0; $j < $opcount; $j++) {
- $optval = defined($options[$j]->getVar('confop_value')) ? constant($options[$j]->getVar('confop_value')) : $options[$j]->getVar('confop_value');
- $optkey = defined($options[$j]->getVar('confop_name')) ? constant($options[$j]->getVar('confop_name')) : $options[$j]->getVar('confop_name');
+ $optval = Xoops_Locale::translate($options[$j]->getVar('confop_value'), $mod->getVar('dirname'));
+ $optkey = Xoops_Locale::translate($options[$j]->getVar('confop_name'), $mod->getVar('dirname'));
$ele->addOption($optval, $optkey);
}
break;
@@ -178,7 +178,7 @@
$criteria = new CriteriaCompo(new Criteria('hasmain', 1));
$criteria->add(new Criteria('isactive', 1));
$moduleslist = $module_handler->getNameList($criteria, true);
- $moduleslist['--'] = _MD_AM_NONE;
+ $moduleslist['--'] = XoopsLocale::NONE;
$ele->addOptionArray($moduleslist);
break;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/functions.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/functions.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/functions.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -74,6 +74,11 @@
if (empty($name)) {
return false;
}
+ //for languages already moved into locale
+ $done = array('preferences');
+ if (in_array($name, $done)) {
+ return false;
+ }
$language = empty($language) ? $xoops->getConfig('language') : $language;
$path = 'modules/' . $domain . '/language/';
if (XoopsLoad::fileExists($file = $xoops->path($path . $language . '/admin/' . $name . '.php'))) {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/include/install.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -26,24 +26,24 @@
$group_handler = $xoops->getHandlerGroup();
// create admin group
$obj = $group_handler->create();
- $obj->setVar("name", addslashes(_MI_SYSTEM_INSTALL_WEBMASTER));
- $obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_WEBMASTERD));
+ $obj->setVar("name", addslashes(XoopsLocale::WEBMASTERS));
+ $obj->setVar("description", addslashes(systemLocale::WEBMASTERS_OF_THIS_SITE));
$obj->setVar("group_type", 'Admin');
if (!$group_handler->insert($obj)) {
echo $xoops->alert('error', $obj->getHtmlErrors());
}
// create registered users group
$obj = $group_handler->create();
- $obj->setVar("name", addslashes(_MI_SYSTEM_INSTALL_REGUSERS));
- $obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_REGUSERSD));
+ $obj->setVar("name", addslashes(systemLocale::REGISTERED_USERS));
+ $obj->setVar("description", addslashes(systemLocale::REGISTERED_USERS_GROUP));
$obj->setVar("group_type", 'User');
if (!$group_handler->insert($obj)) {
echo $xoops->alert('error', $obj->getHtmlErrors());
}
// create anonymous users group
$obj = $group_handler->create();
- $obj->setVar("name", addslashes(_MI_SYSTEM_INSTALL_ANONUSERS));
- $obj->setVar("description", addslashes(_MI_SYSTEM_INSTALL_ANONUSERSD));
+ $obj->setVar("name", addslashes(systemLocale::ANONYMOUS_USERS));
+ $obj->setVar("description", addslashes(systemLocale::ANONYMOUS_USERS_GROUP));
$obj->setVar("group_type", 'Anonymous');
if (!$group_handler->insert($obj)) {
echo $xoops->alert('error', $obj->getHtmlErrors());
Copied: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_modinfo.php (from rev 10963, XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_modinfo.php (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/_modinfo.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -0,0 +1,127 @@
+<?php
+// $Id$
+// _LANGCODE: en
+// _CHARSET : UTF-8
+// Translator: XOOPS Translation Team
+
+// Module Info
+
+// The name of this module
+//define("_MI_SYSTEM_NAME","System");
+
+// A brief description of this module
+//define("_MI_SYSTEM_DESC","For administration of core settings of the site.");
+
+// Names of blocks for this module (Not all module has blocks)
+/*
+define("_MI_SYSTEM_BNAME2","User Menu");
+define("_MI_SYSTEM_BNAME3","Login");
+define("_MI_SYSTEM_BNAME5","Waiting Contents");
+define("_MI_SYSTEM_BNAME6","Main Menu");
+define("_MI_SYSTEM_BNAME7","Site Info");
+define("_MI_SYSTEM_BNAME8", "Who is Online");
+define("_MI_SYSTEM_BNAME9", "Top Posters");
+define("_MI_SYSTEM_BNAME10", "New Members");
+//define("_MI_SYSTEM_BNAME11", "Recent Comments");
+// RMV-NOTIFY
+//define("_MI_SYSTEM_BNAME12", "Notification Options");
+define("_MI_SYSTEM_BNAME13", "Themes");
+*/
+// Names of admin menu items
+/*define("_MI_SYSTEM_ADMENU2","Blocks");
+define("_MI_SYSTEM_ADMENU3","Groups");
+define("_MI_SYSTEM_ADMENU5","Modules");
+define("_MI_SYSTEM_ADMENU6","Preferences");
+define("_MI_SYSTEM_ADMENU10","Edit User");
+define("_MI_SYSTEM_ADMENU12", "Find Users");
+define("_MI_SYSTEM_ADMENU13", "Images");
+define("_MI_SYSTEM_ADMENU15", "Templates");*/
+
+//Site preference
+/*
+define("_MI_SYSTEM_GENERAL", "General Settings");
+define("_MI_SYSTEM_USERSETTINGS", "User Info Settings");
+define("_MI_SYSTEM_METAFOOTER", "Meta Tags and Footer");
+define("_MI_SYSTEM_MAIL", "Email Setup");
+define("_MI_SYSTEM_CENSOR", "Word Censoring Options");
+define("_MI_SYSTEM_AUTHENTICATION", "Authentication Options");
+define("_MI_SYSTEM_SITEPREFERENCE_ANON", "Anonymous");
+define("_MI_SYSTEM_SITEPREFERENCE_CLOSESITETEXT", "The site is currently closed for maintenance. Please come back later.");
+define("_MI_SYSTEM_SITEPREFERENCE_DISCLMR", "While the administrators and moderators of this site will attempt to remove
+or edit any generally objectionable material as quickly as possible, it is
+impossible to review every message. Therefore you acknowledge that all posts
+made to this site express the views and opinions of the author and not the
+administrators, moderators or webmaster (except for posts by these people)
+and hence will not be held liable.
+
+You agree not to post any abusive, obscene, vulgar, slanderous, hateful,
+threatening, sexually-orientated or any other material that may violate any
+applicable laws. Doing so may lead to you being immediately and permanently
+banned (and your service provider being informed). The IP address of all
+posts is recorded to aid in enforcing these conditions. Creating multiple
+accounts for a single user is not allowed. You agree that the webmaster,
+administrator and moderators of this site have the right to remove, edit,
+move or close any topic at any time should they see fit. As a user you agree
+to any information you have entered above being stored in a database. While
+this information will not be disclosed to any third party without your
+consent the webmaster, administrator and moderators cannot be held
+responsible for any hacking attempt that may lead to the data being
+compromised.
+
+This site system uses cookies to store information on your local computer.
+These cookies do not contain any of the information you have entered above,
+they serve only to improve your viewing pleasure. The email address is used
+only for confirming your registration details and password (and for sending
+new passwords should you forget your current one).
+
+By clicking Register below you agree to be bound by these conditions.");
+
+define("_MI_SYSTEM_SITEPREFERENCE_METAKEY", "xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management");
+define("_MI_SYSTEM_SITEPREFERENCE_METADSC", "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.");
+
+
+//Preference
+//define("_MI_SYSTEM_PREFERENCE_BREAK_GENERAL","General Settings");
+define("_MI_SYSTEM_PREFERENCE_TIPS","Help online?");
+define("_MI_SYSTEM_PREFERENCE_TIPS_DSC","This gives you tips and online help");
+define("_MI_SYSTEM_PREFERENCE_ICONS","Icons");
+define("_MI_SYSTEM_PREFERENCE_BREADCRUMB","Breadcrumb");
+
+//define("_MI_SYSTEM_PREFERENCE_BREAK_ACTIVE","Active Section");
+
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_BLOCKSADMIN","");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_FILEMANAGER","Active File Manager");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_GROUPS","");
+//define("_MI_SYSTEM_PREFERENCE_ACTIVE_IMAGES","Active Images Manager");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_MODULESADMIN","");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_PREFERENCES","");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_TPLSETS","");
+define("_MI_SYSTEM_PREFERENCE_ACTIVE_USERS","Active Users");
+//define("_MI_SYSTEM_PREFERENCE_ACTIVE_EXTENSIONS","Extensions");
+//define("_MI_SYSTEM_PREFERENCE_ACTIVE_THEMES","Themes");
+
+//define("_MI_SYSTEM_PREFERENCE_BREAK_PAGER","Number of rows to display in the administration");
+define("_MI_SYSTEM_PREFERENCE_GROUPS_PAGER","Number of groups to display per page");
+//define("_MI_SYSTEM_PREFERENCE_IMAGES_PAGER","Number of images to display per page");
+define("_MI_SYSTEM_PREFERENCE_USERS_PAGER","Number of users to display per page");
+
+//define("_MI_SYSTEM_PREFERENCE_BREAK_EDITOR","Editor Settings");
+define("_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR","Editor for blocks:");
+define("_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR_DSC","");
+//define("_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR","Editor for comments:");
+//define("_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR_DSC","");
+define("_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR","Editor for all modules:");
+define("_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR_DSC","");
+define("_MI_SYSTEM_PREFERENCE_ANONPOST","");
+define("_MI_SYSTEM_PREFERENCE_REDIRECT","");
+
+define("_MI_SYSTEM_PREFERENCE_JQUERY_THEME", "jQuery theme");
+*/
+//2.6.0 Alpha 2
+/*
+define('_MI_SYSTEM_INSTALL_WEBMASTER', 'Webmasters');
+define('_MI_SYSTEM_INSTALL_WEBMASTERD', 'Webmasters of this site');
+define('_MI_SYSTEM_INSTALL_REGUSERS', 'Registered Users');
+define('_MI_SYSTEM_INSTALL_REGUSERSD', 'Registered Users Group');
+define('_MI_SYSTEM_INSTALL_ANONUSERS', 'Anonymous Users');
+define('_MI_SYSTEM_INSTALL_ANONUSERSD', 'Anonymous Users Group');*/
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/admin/preferences.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -8,10 +8,10 @@
*/
// dont change
-define("_AM_DBUPDATED",_AM_SYSTEM_DBUPDATED);
+//define("_AM_DBUPDATED",_AM_SYSTEM_DBUPDATED);
//Nav
-define("_AM_SYSTEM_PREFERENCES_NAV_MAIN","Preferences");
+//define("_AM_SYSTEM_PREFERENCES_NAV_MAIN","Preferences");
//define("_AM_SYSTEM_PREFERENCES_MAIN","Main");
/*define("_AM_SYSTEM_PREFERENCES_NAV_MD_AM_GENERAL","General Settings");
define("_AM_SYSTEM_PREFERENCES_NAV_MD_AM_USERSETTINGS","User Info Settings");
@@ -33,11 +33,12 @@
define("_AM_SYSTEM_PREFERENCES_NAV_TIPS_MD_AM_MAILER","A faire");
define("_AM_SYSTEM_PREFERENCES_NAV_TIPS_MD_AM_AUTHENTICATION","A faire");
*/
-define("_MD_AM_SITEPREF", "Site Preferences");
-define("_MD_AM_SITENAME", "Site name");
-define("_MD_AM_SITENAMEDSC", "");
-define("_MD_AM_SLOGAN", "Slogan for your site");
-define("_MD_AM_SLOGANDSC", "");
+//define("_MD_AM_SITEPREF", "Site Preferences");
+//define("_MD_AM_SITENAME", "Site name");
+//define("_MD_AM_SITENAMEDSC", "");
+//define("_MD_AM_SLOGAN", "Slogan for your site");
+//define("_MD_AM_SLOGANDSC", "");
+/*
define("_MD_AM_ADMINML", "Admin email address");
define("_MD_AM_ADMINMLDSC", "");
define("_MD_AM_LANGUAGE", "Default language");
@@ -117,7 +118,7 @@
/*define("_MD_AM_DEBUGMODE0", "Off");
define("_MD_AM_DEBUGMODE1", "Enable debug (inline mode)");
define("_MD_AM_DEBUGMODE2", "Enable debug (popup mode)");
-define("_MD_AM_DEBUGMODE3", "Smarty Templates Debug");*/
+define("_MD_AM_DEBUGMODE3", "Smarty Templates Debug");
define("_MD_AM_MINUNAME", "Minimum length of username required");
define("_MD_AM_MINUNAMEDSC", "");
define("_MD_AM_MAXUNAME", "Maximum length of username");
@@ -248,7 +249,7 @@
"<br><br>Format [Xoops Database field]=[Auth system SOAP attribute]" .
"<br>for example : email=mail" .
"<br>Separate each with a |" .
- "<br><br>!! For advanced users !!");*/
+ "<br><br>!! For advanced users !!");
// Xoops Authentication constants
@@ -329,4 +330,5 @@
// Preference module system
-define("_AM_SYSTEM_PREFERENCES_SETTINGS","System Module Settings");
\ No newline at end of file
+define("_AM_SYSTEM_PREFERENCES_SETTINGS","System Module Settings");
+*/
\ No newline at end of file
Deleted: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/language/english/modinfo.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -1,125 +0,0 @@
-<?php
-// $Id$
-// _LANGCODE: en
-// _CHARSET : UTF-8
-// Translator: XOOPS Translation Team
-
-// Module Info
-
-// The name of this module
-define("_MI_SYSTEM_NAME","System");
-
-// A brief description of this module
-define("_MI_SYSTEM_DESC","For administration of core settings of the site.");
-
-// Names of blocks for this module (Not all module has blocks)
-define("_MI_SYSTEM_BNAME2","User Menu");
-define("_MI_SYSTEM_BNAME3","Login");
-define("_MI_SYSTEM_BNAME5","Waiting Contents");
-define("_MI_SYSTEM_BNAME6","Main Menu");
-define("_MI_SYSTEM_BNAME7","Site Info");
-define("_MI_SYSTEM_BNAME8", "Who is Online");
-define("_MI_SYSTEM_BNAME9", "Top Posters");
-define("_MI_SYSTEM_BNAME10", "New Members");
-//define("_MI_SYSTEM_BNAME11", "Recent Comments");
-// RMV-NOTIFY
-//define("_MI_SYSTEM_BNAME12", "Notification Options");
-define("_MI_SYSTEM_BNAME13", "Themes");
-
-// Names of admin menu items
-/*define("_MI_SYSTEM_ADMENU2","Blocks");
-define("_MI_SYSTEM_ADMENU3","Groups");
-define("_MI_SYSTEM_ADMENU5","Modules");
-define("_MI_SYSTEM_ADMENU6","Preferences");
-define("_MI_SYSTEM_ADMENU10","Edit User");
-define("_MI_SYSTEM_ADMENU12", "Find Users");
-define("_MI_SYSTEM_ADMENU13", "Images");
-define("_MI_SYSTEM_ADMENU15", "Templates");*/
-
-//Site preference
-define("_MI_SYSTEM_GENERAL", "General Settings");
-define("_MI_SYSTEM_USERSETTINGS", "User Info Settings");
-define("_MI_SYSTEM_METAFOOTER", "Meta Tags and Footer");
-define("_MI_SYSTEM_MAIL", "Email Setup");
-define("_MI_SYSTEM_CENSOR", "Word Censoring Options");
-define("_MI_SYSTEM_AUTHENTICATION", "Authentication Options");
-define("_MI_SYSTEM_SITEPREFERENCE_ANON", "Anonymous");
-define("_MI_SYSTEM_SITEPREFERENCE_CLOSESITETEXT", "The site is currently closed for maintenance. Please come back later.");
-define("_MI_SYSTEM_SITEPREFERENCE_DISCLMR", "While the administrators and moderators of this site will attempt to remove
-or edit any generally objectionable material as quickly as possible, it is
-impossible to review every message. Therefore you acknowledge that all posts
-made to this site express the views and opinions of the author and not the
-administrators, moderators or webmaster (except for posts by these people)
-and hence will not be held liable.
-
-You agree not to post any abusive, obscene, vulgar, slanderous, hateful,
-threatening, sexually-orientated or any other material that may violate any
-applicable laws. Doing so may lead to you being immediately and permanently
-banned (and your service provider being informed). The IP address of all
-posts is recorded to aid in enforcing these conditions. Creating multiple
-accounts for a single user is not allowed. You agree that the webmaster,
-administrator and moderators of this site have the right to remove, edit,
-move or close any topic at any time should they see fit. As a user you agree
-to any information you have entered above being stored in a database. While
-this information will not be disclosed to any third party without your
-consent the webmaster, administrator and moderators cannot be held
-responsible for any hacking attempt that may lead to the data being
-compromised.
-
-This site system uses cookies to store information on your local computer.
-These cookies do not contain any of the information you have entered above,
-they serve only to improve your viewing pleasure. The email address is used
-only for confirming your registration details and password (and for sending
-new passwords should you forget your current one).
-
-By clicking Register below you agree to be bound by these conditions.");
-
-define("_MI_SYSTEM_SITEPREFERENCE_METAKEY", "xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management");
-define("_MI_SYSTEM_SITEPREFERENCE_METADSC", "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.");
-
-
-//Preference
-//define("_MI_SYSTEM_PREFERENCE_BREAK_GENERAL","General Settings");
-define("_MI_SYSTEM_PREFERENCE_TIPS","Help online?");
-define("_MI_SYSTEM_PREFERENCE_TIPS_DSC","This gives you tips and online help");
-define("_MI_SYSTEM_PREFERENCE_ICONS","Icons");
-define("_MI_SYSTEM_PREFERENCE_BREADCRUMB","Breadcrumb");
-
-//define("_MI_SYSTEM_PREFERENCE_BREAK_ACTIVE","Active Section");
-
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_BLOCKSADMIN","");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_FILEMANAGER","Active File Manager");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_GROUPS","");
-//define("_MI_SYSTEM_PREFERENCE_ACTIVE_IMAGES","Active Images Manager");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_MODULESADMIN","");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_PREFERENCES","");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_TPLSETS","");
-define("_MI_SYSTEM_PREFERENCE_ACTIVE_USERS","Active Users");
-//define("_MI_SYSTEM_PREFERENCE_ACTIVE_EXTENSIONS","Extensions");
-//define("_MI_SYSTEM_PREFERENCE_ACTIVE_THEMES","Themes");
-
-//define("_MI_SYSTEM_PREFERENCE_BREAK_PAGER","Number of rows to display in the administration");
-define("_MI_SYSTEM_PREFERENCE_GROUPS_PAGER","Number of groups to display per page");
-//define("_MI_SYSTEM_PREFERENCE_IMAGES_PAGER","Number of images to display per page");
-define("_MI_SYSTEM_PREFERENCE_USERS_PAGER","Number of users to display per page");
-
-//define("_MI_SYSTEM_PREFERENCE_BREAK_EDITOR","Editor Settings");
-define("_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR","Editor for blocks:");
-define("_MI_SYSTEM_PREFERENCE_BLOCKS_EDITOR_DSC","");
-//define("_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR","Editor for comments:");
-//define("_MI_SYSTEM_PREFERENCE_COMMENTS_EDITOR_DSC","");
-define("_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR","Editor for all modules:");
-define("_MI_SYSTEM_PREFERENCE_GENERAL_EDITOR_DSC","");
-define("_MI_SYSTEM_PREFERENCE_ANONPOST","");
-define("_MI_SYSTEM_PREFERENCE_REDIRECT","");
-
-define("_MI_SYSTEM_PREFERENCE_JQUERY_THEME", "jQuery theme");
-
-//2.6.0 Alpha 2
-
-define('_MI_SYSTEM_INSTALL_WEBMASTER', 'Webmasters');
-define('_MI_SYSTEM_INSTALL_WEBMASTERD', 'Webmasters of this site');
-define('_MI_SYSTEM_INSTALL_REGUSERS', 'Registered Users');
-define('_MI_SYSTEM_INSTALL_REGUSERSD', 'Registered Users Group');
-define('_MI_SYSTEM_INSTALL_ANONUSERS', 'Anonymous Users');
-define('_MI_SYSTEM_INSTALL_ANONUSERSD', 'Anonymous Users Group');
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/locale/en_US/en_US.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/locale/en_US/en_US.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/locale/en_US/en_US.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -20,7 +20,7 @@
class SystemLocaleEn_US /*extends XoopsLocaleEn_US*/
{
- const DISCLAIMER_TEXT = "While the administrators and moderators of this site will attempt to remove
+ const CONF_DISCLAIMER_DEFAULT = "While the administrators and moderators of this site will attempt to remove
or edit any generally objectionable material as quickly as possible, it is
impossible to review every message. Therefore you acknowledge that all posts
made to this site express the views and opinions of the author and not the
@@ -66,7 +66,7 @@
const ALLOW_OTHER_USERS_TO_VIEW_THIS_EMAIL_ADDRESS = "Allow other users to view this email address";
const ANONYMOUS_USERS = "Anonymous users";
const ANONYMOUS_USERS_GROUP = "Anonymous users group";
- const AUTHENTICATION_OPTIONS = "Authentication options";
+ const AUTHENTICATION = "Authentication";
const AUTO_FORMAT_SMILIES_DISABLED = "Auto format (smilies disabled)";
const AUTO_FORMAT_SMILIES_ENABLED = "Auto format (smilies enabled)";
const AVAILABLE_MODULES = "Available modules";
@@ -74,8 +74,26 @@
const BLOCKS_INFO = "With blocks you can <br /> add many thing for <br /> your users";
const BLOCKS_TIPS = "<ul><li>You can easily change side or order position with the drag\'n drop, click on <img class='tooltip' src='%s' alt='%s' title='%s' /> this image and set your site just the way you want it</li><li>Add a new custom block</li><li>Set block online or offline by clicking on <img class='tooltip' width='16' src='%s' alt='%s' title='%s'/> or <img class='tooltip' width='16' src='%s' alt= '%s' title='%s' /></li></ul>";
const BLOCK_ACCESS_RIGHTS = "Block access rights";
+ const BLOCK_LOGIN = "Login";
+ const BLOCK_LOGIN_DESC = "Shows login form";
+ const BLOCK_MAIN_MENU = "Main menu";
+ const BLOCK_MAIN_MENU_DESC = "Shows the main navigation menu of the site";
const BLOCK_NAME = "Block name";
+ const BLOCK_NEW_MEMBERS = "New members";
+ const BLOCK_NEW_MEMBERS_DESC = "Shows most recent users";
+ const BLOCK_SITE_INFORMATION = "Site information";
+ const BLOCK_SITE_INFORMATION_DESC = "Shows basic information about the site and a link to 'Recommend Us' pop up window";
+ const BLOCK_THEMES = "Themes";
+ const BLOCK_THEMES_DESC = "Shows theme selection box";
+ const BLOCK_TOP_POSTERS = "Top posters";
+ const BLOCK_TOP_POSTERS_DESC = "Displays your site top posters";
const BLOCK_TYPE = "Block type";
+ const BLOCK_USER_MENU = "User menu";
+ const BLOCK_USER_MENU_DESC = "Shows user block";
+ const BLOCK_WAITING_CONTENTS = "Waiting contents";
+ const BLOCK_WAITING_CONTENTS_DESC = "Shows contents waiting for approval";
+ const BLOCK_WHO_IS_ONLINE = "Who is online";
+ const BLOCK_WHO_IS_ONLINE_DESC = "Displays users/guests currently online";
const BOTTOM_CENTER = "Bottom center";
const BOTTOM_LEFT = "Bottom left";
const BOTTOM_RIGHT = "Bottom right";
@@ -90,22 +108,18 @@
const CHOOSE_TEMPLATE = "Choose Template";
const CLICK_TO_EDIT_MODULE_NAME = "Click to edit module name...";
const CLONE_BLOCK = "Clone a block";
- const CLOSE_SITE_TEXT = "The site is currently closed for maintenance. Please come back later.";
const COMMENTS_SPAN = "<ul><li><span class='bold red'>%s</span> comments.</li></ul>";
const CONF_ACTIVATION_GROUP = "Select group to which activation email will be sent";
const CONF_ACTIVATION_GROUP_DESC = "Valid only when 'Activation by administrators' is selected";
const CONF_ACTIVATION_TYPE = "Select activation type of newly registered users";
- const CONF_ACTIVATION_TYPE_DESC = "";
const CONF_ADMIN_ACTIVATION = "Activation by administrators";
const CONF_ADMIN_EMAIL = "Admin email address";
const CONF_ALLOW_CHANGE_EMAIL = "Allow users to change email address?";
- const CONF_ALLOW_CHANGE_EMAIL_DESC = "";
const CONF_ALLOW_REGISTRATION = "Allow new user registration?";
const CONF_ALLOW_REGISTRATION_DESC = "Select yes to accept new user registration";
const CONF_ANONYMOUS = "Username for anonymous users";
- const CONF_ANONYMOUS_DESC = "";
const CONF_AUTHMETHOD = "Authentication Method";
- const CONF_AUTHMETHODDESC = "Which authentication method would you like to use for signing on users.";
+ const CONF_AUTHMETHOD_DESC = "Which authentication method would you like to use for signing on users.";
const CONF_AUTH_CONFOPTION_AD = "Microsoft Active Directory ©";
const CONF_AUTH_CONFOPTION_LDAP = "Standard LDAP Directory";
const CONF_AUTH_CONFOPTION_XOOPS = "XOOPS Database";
@@ -115,11 +129,14 @@
const CONF_BAD_IPS = "Enter IP addresses that should be banned from the site.<br />Separate each with a <strong>|</strong>, case insensitive, regex enabled (so dot - '.' means 'any char' and '\.' means '.').";
const CONF_BAD_IPS_DESC = "^aaa\.bbb\.ccc will disallow visitors with an IP that starts with aaa.bbb.ccc<br />aaa\.bbb\.ccc$ will disallow visitors with an IP that ends with aaa.bbb.ccc<br />aaa\.bbb\.ccc will disallow visitors with an IP that contains aaa.bbb.ccc";
const CONF_BAD_USERNAMES = "Enter names that should not be selected as username";
+ const CONF_BLOCKS_EDITOR = "Editor for blocks:";
+ const CONF_BREADCRUMB ="Breadcrumb";
const CONF_CENSORRPLC = "Censored words will be replaced with:";
const CONF_CENSORRPLC_DESC = "Censored words will be replaced with the characters entered in this textbox";
const CONF_CENSORWRD = "Words to censor";
const CONF_CENSORWRD_DESC = "Enter words that should be censored in user posts.<br />Separate each with a <strong>|</strong>, case insensitive.";
const CONF_CLOSE_SITE = "Turn your site off?";
+ const CONF_CLOSE_SITE_DEFAULT = "The site is currently closed for maintenance. Please come back later.";
const CONF_CLOSE_SITE_DESC = "Select yes to turn your site off so that only users in selected groups have access to the site. ";
const CONF_CLOSE_SITE_GROUP = "Select groups that are allowed to access while the site is turned off.";
const CONF_CLOSE_SITE_GROUP_DESC = "Users in the default webmasters group are always granted access.";
@@ -135,11 +152,17 @@
const CONF_ENABLE_BAD_IPS = "Enable IP bans?";
const CONF_ENABLE_BAD_IPS_DESC = "Users from specified IP addresses will not be able to view your site";
const CONF_FOOTER = "Footer";
+ const CONF_FOOTER_DEFAULT = "Powered by XOOPS @ 2001-%s <a href='http://xoops.sourceforge.net' rel='external' title='The XOOPS Project'>The XOOPS Project</a>";
const CONF_FOOTER_DESC = "Be sure to type links in full path starting from http://, otherwise the links will not work correctly in modules pages.";
+ const CONF_GENERAL_EDITOR = "Editor for modules:";
+ const CONF_GROUPS_PER_PAGE = "Number of groups to display per page";
const CONF_GZIP_COMPRESSION = "Use gzip compression?";
- const CONF_GZIP_COMPRESSION_DESC = "";
+ const CONF_HELP_ONLINE = "Help online?";
+ const CONF_HELP_ONLINE_DESC = "This gives you tips and online help";
+ const CONF_ICONS = "Icons";
const CONF_INDEXFOLLOW = "Index, follow";
const CONF_INDEXNOFOLLOW = "Index, no follow";
+ const CONF_JQUERY_THEME = "jQuery theme";
const CONF_LANGUAGE = "Default language";
const CONF_LDAP_BASE_DN = "LDAP - Base DN";
const CONF_LDAP_BASE_DN_DESC = "The base DN (Distinguished Name) of your LDAP directory tree.";
@@ -150,11 +173,11 @@
const CONF_LDAP_FILTER_PERSON = "The search filter LDAP query to find user";
const CONF_LDAP_FILTER_PERSON_DESC = "Special LDAP Filter to find user. @@loginname@@ is replace by the users's login name<br> MUST BE BLANK IF YOU DON'T KNOW WHAT YOU DO' !<br />Ex : (&(objectclass=person)(samaccountname=@@loginname@@)) for AD <br />Ex : (&(objectclass=inetOrgPerson)(uid=@@loginname@@)) for LDAP";
const CONF_LDAP_GIVENNAME_ATTR = "LDAP - Given Name Field Name";
- const CONF_LDAP_GIVENNAME_ATTR_DSC = "The name of the Given Name attribute in your LDAP directory.";
+ const CONF_LDAP_GIVENNAME_ATTR_DESC = "The name of the Given Name attribute in your LDAP directory.";
const CONF_LDAP_LOGINLDAP_ATTR = "LDAP Attribute use to search the user";
- const CONF_LDAP_LOGINLDAP_ATTR_D = "When Login name use in the DN option is set to yes, must correspond to the login name XOOPS";
+ const CONF_LDAP_LOGINLDAP_ATTR_DESC = "When Login name use in the DN option is set to yes, must correspond to the login name XOOPS";
const CONF_LDAP_LOGINNAME_ASDN = "Login name use in the DN";
- const CONF_LDAP_LOGINNAME_ASDN_D = "The XOOPS login name is used in the LDAP DN (eg : uid=<loginname>,dc=xoops,dc=org)<br>The entry is directly read in the LDAP Server without search";
+ const CONF_LDAP_LOGINNAME_ASDN_DESC = "The XOOPS login name is used in the LDAP DN (eg : uid=<loginname>,dc=xoops,dc=org)<br>The entry is directly read in the LDAP Server without search";
const CONF_LDAP_MAIL_ATTR = "LDAP - Email Field Name";
const CONF_LDAP_MAIL_ATTR_DESC = "The name of the E-Mail attribute in your LDAP directory tree.";
const CONF_LDAP_MANAGER_DN = "DN of the LDAP manager";
@@ -165,7 +188,7 @@
const CONF_LDAP_PROVIS = "Automatic XOOPS account provisioning";
const CONF_LDAP_PROVIS_DESC = "Create XOOPS user database if it doesn't exists";
const CONF_LDAP_PROVIS_GROUP = "Default affect group";
- const CONF_LDAP_PROVIS_GROUP_DSC = "The new user is assign to these groups";
+ const CONF_LDAP_PROVIS_GROUP_DESC = "The new user is assign to these groups";
const CONF_LDAP_PROVIS_UPD = "Maintain XOOPS account provisioning";
const CONF_LDAP_PROVIS_UPD_DESC = "The XOOPS User account is always synchronized with the Authentication Server";
const CONF_LDAP_SERVER = "LDAP - Server Name";
@@ -183,22 +206,22 @@
const CONF_LEVEL_STRICT = "Strict (only alphabets and numbers)";
const CONF_MAILER = "Email Setup";
const CONF_MAILERMETHOD = "Email delivery method";
- const CONF_MAILERMETHODDESC = "Method used to deliver email. Default is \"mail\", use others only if that makes trouble.";
+ const CONF_MAILERMETHOD_DESC = "Method used to deliver email. Default is \"mail\", use others only if that makes trouble.";
const CONF_MAILFROM = "FROM address";
- const CONF_MAILFROMDESC = "";
const CONF_MAILFROMNAME = "FROM name";
- const CONF_MAILFROMNAMEDESC = "";
const CONF_MAILFROMUID = "FROM user";
- const CONF_MAILFROMUIDDESC = "When the system sends a private message, which user should appear to have sent it?";
+ const CONF_MAILFROMUID_DESC = "When the system sends a private message, which user should appear to have sent it?";
const CONF_MAX_USERNAME = "Maximum length of username";
- const CONF_MAX_USERNAME_DESC = "";
const CONF_METAAUTHOR = "Meta Author";
const CONF_METAAUTHOR_DESC = "The author meta tag defines the name of the author of the document being read. Supported data formats include the name, email address of the webmaster, company name or URL.";
const CONF_METACOPYR = "Meta Copyright";
+ const CONF_METACOPYR_DEFAULT = "Copyright @ 2001-%s";
const CONF_METACOPYR_DESC = "The copyright meta tag defines any copyright statements you wish to disclose about your web page documents.";
const CONF_METADESC = "Meta Description";
+ const CONF_METADESC_DEFAULT= "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.";
const CONF_METADESC_DESC = "The description meta tag is a general description of what is contained in your web page";
const CONF_METAKEY = "Meta Keywords";
+ const CONF_METAKEY_DEFAULT = "xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management";
const CONF_METAKEY_DESC = "The keywords meta tag is a series of keywords that represents the content of your site. Type in keywords with each separated by a comma or a space in between. (Ex. XOOPS, PHP, mySQL, portal system)";
const CONF_METAO14YRS = "14 years";
const CONF_METAOGEN = "General";
@@ -207,16 +230,12 @@
const CONF_METARATING = "Meta Rating";
const CONF_METARATING_DESC = "The rating meta tag defines your site age and content rating";
const CONF_METAROBOTS = "Meta Robots";
- const CONF_METAROBOTSDSC = "The Robots Tag declares to search engines what content to index and spider";
+ const CONF_METAROBOTS_DESC = "The Robots Tag declares to search engines what content to index and spider";
const CONF_MIN_PASS = "Minimum required length of the password";
- const CONF_MIN_PASS_DESC = "";
const CONF_MIN_USERNAME = "Minimum length of username required";
- const CONF_MIN_USERNAME_DSC = "";
- const CONF_MODCONFIG = "Module Config Options";
const CONF_MODULE_CACHE = "Module-wide Cache";
const CONF_MODULE_CACHE_DESC = "Caches module contents for a specified amount of time to enhance performance. Setting module-wide cache will override module item level cache if any.";
const CONF_NEW_USER_NOTIFY = "Notify by email when a new user is registered?";
- const CONF_NEW_USER_NOTIFY_DESC = "";
const CONF_NOINDEXFOLLOW = "No Index, Follow";
const CONF_NOINDEXNOFOLLOW = "No Index, No Follow";
const CONF_NOMODULE = "There is no module that can be cached.";
@@ -226,47 +245,47 @@
const CONF_REGDSCLMR = "Registration disclaimer";
const CONF_REGDSCLMR_DESC = "Enter text to be displayed as registration disclaimer";
const CONF_SELF_DELETE = "Allow users to delete own account?";
- const CONF_SELF_DELETE_DESC = "";
const CONF_SENDMAILPATH = "Path to sendmail";
- const CONF_SENDMAILPATHDESC = "Path to the sendmail program (or substitute) on the webserver.";
+ const CONF_SENDMAILPATH_DESC = "Path to the sendmail program (or substitute) on the webserver.";
const CONF_SERVER_TIMEZONE = "Server timezone";
const CONF_SESSION_EXPIRE = "Session expiration";
const CONF_SESSION_EXPIRE_DESC = "Maximum duration of session idle time in minutes (Valid only when 'use custom session' is enabled.)";
const CONF_SESSION_NAME = "Session name";
const CONF_SESSION_NAME_DESC = "The name of session (Valid only when 'use custom session' is enabled)";
const CONF_SITE_NAME = "Site name";
+ const CONF_SITE_NAME_DEFAULT = "XOOPS Site";
const CONF_SLOGAN = "Slogan for your site";
+ const CONF_SLOGAN_DEFAULT = "Just use it!";
const CONF_SMTPHOST = "SMTP host(s)";
- const CONF_SMTPHOSTDESC = "List of SMTP servers to try to connect to.";
+ const CONF_SMTPHOST_DESC = "List of SMTP servers to try to connect to.";
const CONF_SMTPPASS = "SMTPAuth password";
- const CONF_SMTPPASSDESC = "Password to connect to an SMTP host with SMTPAuth.";
+ const CONF_SMTPPASS_DESC = "Password to connect to an SMTP host with SMTPAuth.";
const CONF_SMTPUSER = "SMTPAuth username";
- const CONF_SMTPUSERDESC = "Username to connect to an SMTP host with SMTPAuth.";
+ const CONF_SMTPUSER_DESC = "Username to connect to an SMTP host with SMTPAuth.";
const CONF_SSL_LINK = "URL where SSL login page is located";
- const CONF_SSL_LINK_DESC = "";
const CONF_SSL_POST_NAME = "SSL Post variable name";
const CONF_SSL_POST_NAME_DESC = "The name of variable used to transfer session value via POST. If you are unsure, set any name that is hard to guess.";
const CONF_START_PAGE = "Module for your start page";
const CONF_TEMPLATE_SET = "Default template set";
- const CONF_TEMPLATE_SET_DESC = "";
const CONF_THEME_FILE = "Check templates for modifications ?";
const CONF_THEME_FILE_DESC = "If this option is enabled, modified templates will be automatically recompiled when they are displayed. You must turn this option off on a production site.";
const CONF_THEME_SET = "Default theme";
const CONF_THEME_SET_ALLOWED = "Selectable themes";
const CONF_THEME_SET_ALLOWED_DESC = "Choose themes that users can select as the default theme";
const CONF_USERNAME_LEVEL = "Select the level of strictness for username filtering";
- const CONF_USERNAME_LEVEL_DESC = "";
+ const CONF_USERS_PER_PAGE = "Number of users to display per page";
const CONF_USER_ACTIVATION = "Requires activation by user (recommended)";
const CONF_USER_COOKIE = "Name for user cookies.";
const CONF_USER_COOKIE_DESC = "If the cookie name is set, 'Remember me' will be enabled for user login. If a user has chosen 'Remember me', he will be logged in automatically. The expiration for the cookie is one year.";
const CONF_USE_MY_SESSION = "Use custom session";
const CONF_USE_MY_SESSION_DESC = "Select yes to customize session related values.";
const CONF_USE_SSL = "Use SSL for login?";
- const CONF_USE_SSL_DESC = ", SSL is used for secure login and requires a certificate. Contact your Host about how to obtain certificate for your site.";
+ const CONF_USE_SSL_DESC = "SSL is used for secure login and requires a certificate. Contact your Host about how to obtain certificate for your site.";
const CONF_WELCOME_TYPE = "Sending welcoming message";
const CONF_WELCOME_TYPE_BOTH = "Email and message";
const CONF_WELCOME_TYPE_DESC = "The way of sending out a welcoming message to a user upon his successful registration.";
const CONF_WELCOME_TYPE_EMAIL = "Email";
+ const CONF_WELCOME_TYPE_NONE = "None";
const CONF_WELCOME_TYPE_PM = "Message";
const CONTENT_TYPE = "Content type";
const CONTROL_PANEL = "Control panel";
@@ -277,8 +296,6 @@
const CUSTOM_BLOCK_HTML = "Custom Block (HTML)";
const CUSTOM_BLOCK_PHP = "Custom Block (PHP)";
const C_DO_NOT_DISPLAY_USERS_WHOSE_RANK_IS = "Do not display users whose rank is:";
- const C_EDITOR_FOR_BLOCKS = "Editor for blocks:";
- const C_EDITOR_FOR_MODULES = "Editor for modules:";
const C_SEARCH_USER = "Search user:";
const C_YOUR_THEMES = "Your themes:";
const DELETE_BLOCK = "Delete a block";
@@ -305,7 +322,6 @@
const EF_BLOCK_NOT_DELETED = "ERROR: Could not delete block %s";
const EF_BLOCK_TEMPLATE_DEPRECATED_NOT_REMOVED = "ERROR: Could not remove deprecated block template.";
const EF_BLOCK_TEMPLATE_NOT_DELETED = "ERROR: Could not delete block template %s from the database";
- const SF_BLOCK_UPDATED = "Block %s updated.";
const EF_CAN_NOT_DELETE_ADMIN_USER = "Admin user cannot be deleted: %s <br />";
const EF_CONFIG_NOT_ADDED_TO_DATABASE = " ERROR: Could not insert config %s to the database.";
const EF_COULD_NOT_ADD_PERMISSION_FOR_GROUP = "Could not add %s permission to %s for group %s";
@@ -319,7 +335,6 @@
const EF_TEMPLATE_NOT_DELETED_FROM_DATABASE = "ERROR: Could not delete template %s from the database.";
const EF_TEMPLATE_NOT_RECOMPILED = "ERROR: Template %s recompile failed";
const EF_TEMPLATE_NOT_UPDATED = "ERROR: Could not update %s template.";
- const EMAIL_SETUP = "Email setup";
const EMPTY_FILE = "Empty file";
const EXTENSIONS_ADMINISTRATION = "Extensions administration";
const EXTENSIONS_INFO = "Here you can install <br /> and uninstall your XOOPS <br /> extensions.";
@@ -327,8 +342,8 @@
const E_BLOCK_ACCESS_NOT_ADDED = "ERROR: Could not add block access right";
const E_CONFIG_DATA_NOT_DELETED_FROM_DATABASE = "ERROR: Could not delete config data from the database";
const E_GROUP_PERMISSIONS_NOT_DELETED = "ERROR: Could not delete group permissions";
+ const E_NEW_PASSWORDS_NOT_MATCH_TRY_AGAIN = "Sorry, the new passwords do not match. Click back and try again";
const E_NOT_RESTORED = "Not restored";
- const E_NEW_PASSWORDS_NOT_MATCH_TRY_AGAIN = "Sorry, the new passwords do not match. Click back and try again";
const E_SYSTEM_BLOCKS_CANNOT_BE_DELETED = "System blocks cannot be deleted!";
const E_THIS_BLOCK_CANNOT_BE_DELETED = "This block cannot be deleted directly! If you wish to disable this block, deactivate the module.";
const E_YOU_NEED_POSITIVE_INTEGER = "You need a positive integer";
@@ -360,21 +375,16 @@
const INSTALLED_MODULES = "Installed modules";
const INSTALL_EXTENSION = "Install extension";
const INSTALL_MODULE = "Install module";
- const I_THIS_GIVES_YOU_TIPS_AND_HELP = "This gives you tips and online help";
- const JQUERY_THEME = "jQuery theme";
const LARGE_VIEW = "Large view";
const LAST_LOGIN_GREATER_THAN_X = "Last login is more than <span style='color:#ff0000;'>X</span> days ago";
const LAST_LOGIN_LESS_THAN_X = "Last login is less than <span style='color:#ff0000;'>X</span> days ago";
const LINE_VIEW = "Line View";
- const MAIN_MENU = "Main menu";
const MANAGE_BLOCKS = "Manage Blocks";
const MANAGE_MENU = "Manage Menu";
const MANAGE_MODULE = "Manage Module";
const MANAGE_PREFERENCES = "Manage Preferences";
const MENU_BLOCK = "Menu Block";
const MENU_TIPS = "<ul><li>To change order of modules (which will be reflected in the Menu), you just need to drag and drop the modules to the desired placement.</li></ul>";
- const META_DESCRIPTION_TEXT = "XOOPS is a dynamic Object Oriented based open source portal script written in PHP.";
- const META_KEYWORDS_TEXT = "xoops, web applications, web 2.0, sns, news, technology, headlines, linux, software, download, downloads, free, community, forum, bulletin board, bbs, php, survey, polls, kernel, comment, comments, portal, odp, open source, opensource, FreeSoftware, gnu, gpl, license, Unix, *nix, mysql, sql, database, databases, web site, blog, wiki, module, modules, theme, themes, cms, content management";
const META_TAGS_AND_FOOTER = "Meta tags and footer";
const MODULES_ADMINISTRATION = "Modules administration";
const MODULES_INFO = "Here you can install <br /> and unistall your XOOPS <br /> modules. Do you know <br /> which module?";
@@ -384,17 +394,15 @@
const MODULE_DESCRIPTION = "For administration of core settings of the site.";
const MODULE_NAME = "System";
const NEVER_CONNECTED = "Never connected";
- const NEW_MEMBERS = "New members";
const NO_FILES_CREATED = "No files created";
const NO_USERS_FOUND = "No user(s) found";
- const NUMBER_OF_GROUPS_PER_PAGE = "Number of groups to display per page";
const NUMBER_OF_MEMBERS_TO_DISPLAY = "Number of members to display";
const NUMBER_OF_USERS_BY_GROUP = "Number of users by group";
- const NUMBER_OF_USERS_PER_PAGE = "Number of users to display per page";
const ONLY_ACTIVE_USERS = "Only active users";
const ONLY_INACTIVE_USERS = "Only inactive users";
const ONLY_USERS_ACCEPT_EMAIL = "Only users that accept email";
const ONLY_USERS_DO_NOT_ACCEPT_EMAIL = "Only users that don't accept email";
+ const OTHER_SETTINGS = "Other settings";
const PHP_SCRIPT = "PHP Script";
const POPUP_WINDOW_HEIGHT = "Pop-up window height";
const POPUP_WINDOW_WIDTH = "Pop-up window width";
@@ -402,7 +410,6 @@
const POSTS_NUMBERS_LESS_THAN_X = "Number of Posts is less than <span style='color:#ff0000;'>X</span>";
const PREFERENCES_INFO = "XOOPS and all of your <br /> modules have a preferences <br /> for manage module options";
const Q_ARE_YOU_SURE_DELETE_THIS_GROUP = "Are you sure you want to delete this group?";
- const Q_HELP_ONLINE = "Help online?";
const Q_LOST_PASSWORD = "Lost password?";
const Qf_ARE_YOU_SURE_TO_DELETE_THIS_BLOCK = "Are you sure to delete this block ? <div class='bold'>%s</div>";
const REBUILDING_BLOCKS = "Rebuilding blocks...";
@@ -422,6 +429,7 @@
const SF_BLOCK_DELETE = "Block %s deleted.";
const SF_BLOCK_TEMPLATE_DELETED_FROM_DATABASE = "Block template %s deleted from the database. ";
const SF_BLOCK_TEMPLATE_DEPRECATED = "Block template %s deprecated";
+ const SF_BLOCK_UPDATED = "Block %s updated.";
const SF_CONFIG_ADDED_TO_DATABASE = "Config %s added to the database";
const SF_GROUP_ID_USER_ACCESS_RIGHT_ADDED = "Added user access right for Group ID: %s";
const SF_GROUP_ID_USER_ACCESS_RIGHT_NOT_ADDED = "ERROR: Could not add user access right for Group ID: %s";
@@ -434,12 +442,11 @@
const SHOW_ADMIN_GROUPS = "Show admin groups";
const SIDE_BLOCK_LEFT = "Side Block - Left";
const SIDE_BLOCK_RIGHT = "Side Block - Right";
- const SITE_INFORMATION = "Site information";
const SITE_PREFERENCES = "Site preferences";
const SYSTEM_ADMIN_RIGHTS = "System admin rights";
const SYSTEM_CONFIGURATION = "System configuration";
const SYSTEM_MODULE_CANNOT_BE_DEACTIVATED = "System module cannot be deactivated.";
- const SYSTEM_PREFERENCE = "System module settings";
+ const SYSTEM_PREFERENCES = "System module settings";
const S_BLOCK_ACCESS_ADDED = "Added block access right";
const S_CONFIG_DATA_DELETED_FROM_DATABASE = "Config data deleted from the database.";
const S_CONFIG_OPTION_ADDED = "Config option added";
@@ -461,7 +468,6 @@
const TOP_CENTER = "Top center";
const TOP_LEFT = "Top left";
const TOP_PAGE = "Top page";
- const TOP_POSTERS = "Top posters";
const TOP_RIGHT = "Top right";
const UNINSTALL_EXTENSION = "Uninstall extension";
const UNINSTALL_MODULE = "Uninstall module";
@@ -472,15 +478,12 @@
const USERS_INFO = "With this options you <br /> can add new user or <br /> edit old user and userinfo, <br /> change groups and many <br /> other things";
const USERS_MANAGEMENT = "Users management";
const USERS_SPAN = "<ul><li><span class='bold red'>%s</span> users.</li></ul>";
- const USER_MENU = "User menu";
- const USER_SETTINGS = "User settings";
const USER_TIPS = "<ul><li>Manage Xoops users</li></ul>";
const VIEW_ACCOUNT = "View account";
const VIEW_MEMBER_INFO = "View member info";
- const WAITING_CONTENTS = "Waiting contents";
const WEBMASTERS_OF_THIS_SITE = "Webmasters of this site";
const WELCOME_TO_XOOPS_HELP_CENTER = "Welcome to XOOPS Help Center";
- const WORD_CENSORING_OPTIONS = "Word censoring options";
+ const WORD_CENSORING = "Word censoring";
const YOU_CANNOT_REMOVE_THIS_GROUP = "You can not remove this group";
const YOU_MUST_COMPLETE_ALL_REQUIRED_FIELDS = "You must complete all required fields";
}
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/admin/system_preferences.html 2013-02-01 22:17:28 UTC (rev 10964)
@@ -10,9 +10,9 @@
<span><{$preferences.name}></span>
</a>
<{/foreach}>
- <a class="xo-tooltip" href="admin.php?fct=preferences&op=showmod&mod=1" title="<{$smarty.const._AM_SYSTEM_PREFERENCES_SETTINGS}>">
- <img src="<{xoAdminIcons xoops/system_mods.png}>" alt="<{$smarty.const._AM_SYSTEM_PREFERENCES_SETTINGS}>" />
- <span><{$smarty.const._AM_SYSTEM_PREFERENCES_SETTINGS}></span>
+ <a class="xo-tooltip" href="admin.php?fct=preferences&op=showmod&mod=1" title="<{translate key='SYSTEM_PREFERENCES' dirname='system'}>">
+ <img src="<{xoAdminIcons xoops/system_mods.png}>" alt="<{translate key='SYSTEM_PREFERENCES' dirname='system'}>" />
+ <span><{translate key='SYSTEM_PREFERENCES' dirname='system'}></span>
</a>
</div>
<{/if}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/icons.html 2013-02-01 22:17:28 UTC (rev 10964)
@@ -29,8 +29,8 @@
<li>
<a class="xo-tooltip"
href="<{$xoops_url}>/modules/system/admin.php?fct=preferences&op=showmod&mod=<{$modid}>"
- title="<strong><{$smarty.const._MD_AM_SITEPREF}></strong>">
- <img src="<{$theme_icons}>/prefs.png" alt="<{$smarty.const._MD_AM_SITEPREF}>"/>
+ title="<strong><{translate key='SITE_PREFERENCES' dirname='system'}></strong>">
+ <img src="<{$theme_icons}>/prefs.png" alt="<{translate key='SITE_PREFERENCES' dirname='system'}>"/>
</a>
</li>
<{/if}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2013-01-31 23:34:22 UTC (rev 10963)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/xoops_version.php 2013-02-01 22:17:28 UTC (rev 10964)
@@ -24,14 +24,14 @@
/*
General settings
*/
-$modversion['name'] = _MI_SYSTEM_NAME;
-$modversion['description'] = _MI_SYSTEM_DESC;
+$modversion['name'] = SystemLocale::MODULE_NAME;
+$modversion['description'] = SystemLocale::MODULE_DESCRIPTION;
$modversion['version'] = 2.10;
$modversion['author'] = 'Andricq Nicolas,Cointin Maxime,Mage Gregory';
$modversion['nickname'] = 'MusS,Kraven30,Mage';
$modversion['credits'] = 'The XOOPS Project';
-$modversion['license'] = 'GNU GPL 2.0';
-$modversion['license_url'] = 'www.gnu.org/licenses/gpl-2.0.html/';
+$modversion['license'] = 'GNU GPL 2.0';
+$modversion['license_url'] = 'www.gnu.org/licenses/gpl-2.0.html/';
$modversion['official'] = 1;
$modversion['help'] = 'system.html';
$modversion['image'] = 'images/logo.png';
@@ -40,13 +40,13 @@
/*
Settings for configs
*/
-$modversion['release_date'] = '2011/12/20';
-$modversion['module_website_url'] = 'http://www.xoops.org/';
+$modversion['release_date'] = '2011/12/20';
+$modversion['module_website_url'] = 'http://www.xoops.org/';
$modversion['module_website_name'] = 'XOOPS';
-$modversion['module_status'] = 'ALPHA';
-$modversion['min_php'] = '5.3';
-$modversion['min_xoops'] = '2.6.0';
-$modversion['min_db'] = array('mysql'=>'5.0.7', 'mysqli'=>'5.0.7');
+$modversion['module_status'] = 'ALPHA';
+$modversion['min_php'] = '5.3';
+$modversion['min_xoops'] = '2.6.0';
+$modversion['min_db'] = array('mysql' => '5.0.7', 'mysqli' => '5.0.7');
// Admin things
$modversion['hasAdmin'] = 1;
@@ -63,7 +63,9 @@
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
// Tables created by sql file (without prefix!)
-$i=1;
+
+//todo, are we using all these tables?
+$i = 1;
$modversion['tables'][$i] = "block_module_link";
$i++;
$modversion['tables'][$i] = "config";
@@ -106,65 +108,65 @@
// Admin Templates
// Blocks
-$i=0;
+$i = 0;
$modversion['blocks'][$i]['file'] = 'user.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME2;
-$modversion['blocks'][$i]['description'] = 'Shows user block';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_USER_MENU;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_USER_MENU_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_user_show';
$modversion['blocks'][$i]['template'] = 'system_block_user.html';
$i++;
$modversion['blocks'][$i]['file'] = 'login.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME3;
-$modversion['blocks'][$i]['description'] = 'Shows login form';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_LOGIN;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_LOGIN_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_login_show';
$modversion['blocks'][$i]['template'] = 'system_block_login.html';
$i++;
$modversion['blocks'][$i]['file'] = 'waiting.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME5;
-$modversion['blocks'][$i]['description'] = 'Shows contents waiting for approval';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_WAITING_CONTENTS;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_WAITING_CONTENTS_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_waiting_show';
$modversion['blocks'][$i]['template'] = 'system_block_waiting.html';
$i++;
$modversion['blocks'][$i]['file'] = 'main.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME6;
-$modversion['blocks'][$i]['description'] = 'Shows the main navigation menu of the site';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_MAIN_MENU;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_MAIN_MENU_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_main_show';
$modversion['blocks'][$i]['edit_func'] = 'b_system_main_edit';
$modversion['blocks'][$i]['template'] = 'system_block_mainmenu.html';
$i++;
$modversion['blocks'][$i]['file'] = 'info.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME7;
-$modversion['blocks'][$i]['description'] = 'Shows basic info about the site and a link to Recommend Us pop up window';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_SITE_INFORMATION;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_SITE_INFORMATION;
$modversion['blocks'][$i]['show_func'] = 'b_system_info_show';
$modversion['blocks'][$i]['edit_func'] = 'b_system_info_edit';
$modversion['blocks'][$i]['options'] = '320|190|s_poweredby.gif|1';
$modversion['blocks'][$i]['template'] = 'system_block_siteinfo.html';
$i++;
$modversion['blocks'][$i]['file'] = 'online.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME8;
-$modversion['blocks'][$i]['description'] = 'Displays users/guests currently online';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_WHO_IS_ONLINE;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_WHO_IS_ONLINE_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_online_show';
$modversion['blocks'][$i]['template'] = 'system_block_online.html';
$i++;
$modversion['blocks'][$i]['file'] = 'topposters.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME9;
-$modversion['blocks'][$i]['description'] = 'Top posters';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_TOP_POSTERS;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_TOP_POSTERS_DESC;
$modversion['blocks'][$i]['show_func'] = 'b_system_topposters_show';
$modversion['blocks'][$i]['edit_func'] = 'b_system_topposters_edit';
$modversion['blocks'][$i]['options'] = '10|1';
$modversion['blocks'][$i]['template'] = 'system_block_topusers.html';
$i++;
$modversion['blocks'][$i]['file'] = 'newmembers.php';
-$modversion['blocks'][$i]['name'] = _MI_SYSTEM_BNAME10;
-$modversion['blocks'][$i]['description'] = 'Shows most recent users';
+$modversion['blocks'][$i]['name'] = SystemLocale::BLOCK_NEW_MEMBERS;
+$modversion['blocks'][$i]['description'] = SystemLocale::BLOCK_NEW_MEMBERS_DESC;
$modversion['blocks'][$i]['...
[truncated message content] |
