Permalink
Browse files

dgettext removed

  • Loading branch information...
1 parent e85f745 commit d2b28646cdcdea38bc7288b1055c1e61479a5618 @Stardog Stardog committed Feb 9, 2017
Showing with 541 additions and 542 deletions.
  1. +1 −2 core/boost/update.php
  2. +1 −1 mod/access/boost/controlpanel.php
  3. +1 −1 mod/access/boost/uninstall.php
  4. +18 −18 mod/access/class/Access.php
  5. +5 −5 mod/access/conf/error.php
  6. +1 −1 mod/analytics/boost/controlpanel.php
  7. +1 −1 mod/analytics/boost/uninstall.php
  8. +1 −1 mod/block/boost/controlpanel.php
  9. +1 −1 mod/block/boost/uninstall.php
  10. +1 −1 mod/block/class/Block_Admin.php
  11. +1 −1 mod/blog/boost/uninstall.php
  12. +1 −1 mod/blog/class/Blog.php
  13. +3 −3 mod/blog/class/Blog_Admin.php
  14. +6 −6 mod/boost/class/Action.php
  15. +44 −44 mod/boost/class/Boost.php
  16. +4 −4 mod/boost/class/Form.php
  17. +1 −1 mod/boost/conf/error.php
  18. +1 −1 mod/boost/index.php
  19. +1 −1 mod/branch/boost/controlpanel.php
  20. +40 −40 mod/branch/class/Branch_Admin.php
  21. +1 −1 mod/calendar/boost/controlpanel.php
  22. +3 −3 mod/calendar/boost/uninstall.php
  23. +22 −22 mod/calendar/class/Admin.php
  24. +1 −1 mod/calendar/class/Event.php
  25. +1 −1 mod/calendar/class/Schedule.php
  26. +12 −12 mod/calendar/class/User.php
  27. +3 −3 mod/calendar/conf/error.php
  28. +22 −22 mod/checkin/class/Checkin_Admin.php
  29. +4 −4 mod/checkin/class/Checkin_User.php
  30. +12 −12 mod/controlpanel/class/ControlPanel.php
  31. +4 −4 mod/controlpanel/conf/error.php
  32. +1 −1 mod/filecabinet/boost/controlpanel.php
  33. +1 −1 mod/filecabinet/boost/unregister.php
  34. +12 −12 mod/filecabinet/class/Cabinet.php
  35. +2 −2 mod/filecabinet/class/Document_Manager.php
  36. +5 −5 mod/filecabinet/class/File_Assoc.php
  37. +4 −4 mod/filecabinet/class/File_Manager.php
  38. +1 −1 mod/filecabinet/class/Folder.php
  39. +22 −22 mod/filecabinet/class/Forms.php
  40. +1 −1 mod/filecabinet/class/Image_Manager.php
  41. +2 −2 mod/filecabinet/class/Multimedia_Manager.php
  42. +18 −18 mod/filecabinet/conf/error.php
  43. +1 −1 mod/layout/boost/controlpanel.php
  44. +1 −1 mod/layout/boost/install.php
  45. +1 −1 mod/layout/boost/unregister.php
  46. +1 −1 mod/layout/class/Functions.php
  47. +6 −6 mod/layout/class/LayoutAdmin.php
  48. +6 −6 mod/layout/conf/error.php
  49. +1 −1 mod/layout/inc/my_page.php
  50. +1 −1 mod/menu/class/Menu_Item.php
  51. +1 −1 mod/menu/conf/error.php
  52. +5 −5 mod/pagesmith/class/PS_Forms.php
  53. +2 −2 mod/pagesmith/class/PageSmith.php
  54. +5 −5 mod/pagesmith/conf/error.php
  55. +2 −2 mod/phatform/boost/uninstall.php
  56. +3 −3 mod/phatform/class/Element.php
  57. +5 −5 mod/phatform/class/Form.php
  58. +1 −1 mod/phatform/class/FormManager.php
  59. +3 −3 mod/phatform/class/Report.php
  60. +1 −1 mod/phatform/class/Textfield.php
  61. +11 −11 mod/phatform/class/advViews.php
  62. +18 −18 mod/phatform/conf/error.php
  63. +1 −1 mod/pulse/boost/controlpanel.php
  64. +1 −1 mod/rss/boost/controlpanel.php
  65. +2 −2 mod/rss/boost/unregister.php
  66. +8 −8 mod/rss/class/Admin.php
  67. +1 −1 mod/rss/class/Channel.php
  68. +6 −6 mod/rss/class/Feed.php
  69. +2 −2 mod/rss/class/RSS.php
  70. +1 −1 mod/search/boost/controlpanel.php
  71. +1 −1 mod/search/class/Admin.php
  72. +2 −2 mod/search/class/User.php
  73. +1 −1 mod/signup/boost/uninstall.php
  74. +6 −6 mod/signup/class/Forms.php
  75. +13 −13 mod/signup/class/Signup.php
  76. +1 −1 mod/signup/conf/errors.php
  77. +1 −1 mod/users/boost/controlpanel.php
  78. +6 −6 mod/users/boost/install.php
  79. +7 −7 mod/users/boost/register.php
  80. +5 −5 mod/users/boost/unregister.php
  81. +64 −64 mod/users/class/Action.php
  82. +16 −16 mod/users/class/User_Form.php
  83. +26 −26 mod/users/inc/error.php
  84. +1 −1 mod/users/inc/parse.php
  85. +7 −7 setup/class/Setup.php
@@ -73,8 +73,7 @@ function core_update(&$content, $version)
$branch->directory . 'javascript/editors/fckeditor',
true)) {
mkdir($branch->directory . 'images/ckeditor/');
- $this->content[] = dgettext('branch',
- 'Failed to copy FCKeditor to branch.');
+ $this->content[] = 'Failed to copy FCKeditor to branch.';
} else {
$content[] = 'FCKeditor not copied to branch. Check directory permissions.';
}
@@ -6,7 +6,7 @@
$link[] = array('label' => 'Access',
'restricted' => TRUE,
'url' => 'index.php?module=access',
- 'description' => dgettext('access', 'Controls the .htaccess file for Apache and creates shortcuts.'),
+ 'description' => 'Controls the .htaccess file for Apache and creates shortcuts.',
'image' => 'access.png',
'tab' => 'admin'
);
@@ -11,6 +11,6 @@ function access_uninstall(&$content)
{
PHPWS_DB::dropTable('access_shortcuts');
PHPWS_DB::dropTable('access_allow_deny');
- $content[] = dgettext('access', 'Access tables removed.');
+ $content[] = 'Access tables removed.';
return TRUE;
}
@@ -48,26 +48,26 @@ public static function main()
switch ($command) {
case 'post_admin':
Access::saveAdmin();
- Access::sendMessage(dgettext('access', 'Settings saved.'), 'admin');
+ Access::sendMessage('Settings saved.', 'admin');
break;
case 'restore_default':
$source = PHPWS_SOURCE_DIR . 'core/inc/htaccess';
$dest = PHPWS_HOME_DIR . '.htaccess';
if (copy($source, $dest)) {
- Access::sendMessage(dgettext('access', 'Default .htaccess file restored.'), 'update');
+ Access::sendMessage('Default .htaccess file restored.', 'update');
} else {
- Access::sendMessage(dgettext('access', 'Unable to restore default .htaccess file.'), 'update');
+ Access::sendMessage('Unable to restore default .htaccess file.', 'update');
}
break;
case 'post_deny_allow':
$result = Access::postDenyAllow();
if ($result == false) {
- Access::sendMessage(dgettext('access', 'IP address was not formatted correctly or not allowed.'), 'deny_allow');
+ Access::sendMessage('IP address was not formatted correctly or not allowed.', 'deny_allow');
} elseif (PHPWS_Error::isError($result)) {
PHPWS_Error::log($result);
- Access::sendMessage(dgettext('access', 'An error occurred.') . ' ' . dgettext('access', 'Please check your logs.'), 'deny_allow');
+ Access::sendMessage('An error occurred.' . ' ' . 'Please check your logs.', 'deny_allow');
}
Access::sendMessage(NULL, 'deny_allow');
break;
@@ -76,7 +76,7 @@ public static function main()
\phpws\PHPWS_Core::initModClass('access', 'Allow_Deny.php');
$allow_deny = new Access_Allow_Deny($_GET['ad_id']);
$allow_deny->delete();
- Access::sendMessage(dgettext('access', 'IP address deleted.'), 'deny_allow');
+ Access::sendMessage('IP address deleted.', 'deny_allow');
break;
case 'deny_allow':
\phpws\PHPWS_Core::initModClass('access', 'Forms.php');
@@ -90,7 +90,7 @@ public static function main()
if (empty($shortcut->_error) && $shortcut->id) {
$result = $shortcut->delete();
if (PHPWS_Error::isError($result)) {
- Access::sendMessage(dgettext('access', 'An error occurred when deleting your shortcut.'), 'shortcuts');
+ Access::sendMessage('An error occurred when deleting your shortcut.', 'shortcuts');
}
}
Access::sendMessage('Shortcut deleted', 'shortcuts');
@@ -107,7 +107,7 @@ public static function main()
$message = NULL;
$result = Access::postShortcutList();
if (PHPWS_Error::isError($result)) {
- $message = dgettext('access', 'An error occurred.') . ' ' . dgettext('access', 'Please check your logs.');
+ $message = 'An error occurred.' . ' ' . 'Please check your logs.';
}
Access::sendMessage($message, 'shortcuts');
break;
@@ -257,10 +257,10 @@ public static function saveShortcut(Access_Shortcut $shortcut)
$result = $shortcut->save();
if (PHPWS_Error::isError($result)) {
PHPWS_Error::log($result);
- $content[] = dgettext('access', 'A serious error occurred. Please check your error.log.');
+ $content[] = 'A serious error occurred. Please check your error.log.';
$tpl['CLOSE'] = sprintf('<input type="button" value="%s" onclick="window.close()" />', 'Close window');
} else {
- $tpl['TITLE'] = dgettext('access', 'Access has saved your shortcut.');
+ $tpl['TITLE'] = 'Access has saved your shortcut.';
$content[] = dgettext('access', 'You can access this item with the following link:');
$url = $shortcut->getRewrite(true, false);
$content[] = $url;
@@ -394,7 +394,7 @@ public static function cpanel()
}
if (Current_User::isDeity()) {
- $link['title'] = dgettext('access', '.htaccess');
+ $link['title'] = '.htaccess';
$tabs['htaccess'] = $link;
}
@@ -741,7 +741,7 @@ public static function htaccess()
$base_needed = false;
if (!is_file('.htaccess')) {
- $tpl['CURRENT_HTACCESS'] = dgettext('access', 'Your .htaccess file does not exist or is not readable.');
+ $tpl['CURRENT_HTACCESS'] = 'Your .htaccess file does not exist or is not readable.';
} else {
$htaccess_contents = file('.htaccess');
$tpl['CURRENT_HTACCESS'] = implode('', $htaccess_contents);
@@ -755,19 +755,19 @@ public static function htaccess()
if (!$base) {
if ($current_directory == '' || $current_directory == '/') {
- $tpl['BASE_FOUND'] = dgettext('access', 'RewriteBase is not set or needed.');
+ $tpl['BASE_FOUND'] = 'RewriteBase is not set or needed.';
} else {
$base_needed = true;
- $tpl['BASE_FOUND'] = dgettext('access', 'Your RewriteBase is not set but may be needed.');
+ $tpl['BASE_FOUND'] = 'Your RewriteBase is not set but may be needed.';
}
} elseif ($base == $current_directory) {
- $tpl['BASE_FOUND'] = dgettext('access', 'Current RewriteBase matches installation directory.');
+ $tpl['BASE_FOUND'] = 'Current RewriteBase matches installation directory.';
} else {
$base_needed = true;
- $tpl['BASE_FOUND'] = dgettext('access', 'Current RewriteBase does not match the installation directory.');
+ $tpl['BASE_FOUND'] = 'Current RewriteBase does not match the installation directory.';
}
} else {
- $tpl['BASE_FOUND'] = dgettext('access', 'Your .htaccess file is not writable.');
+ $tpl['BASE_FOUND'] = 'Your .htaccess file is not writable.';
}
}
@@ -776,7 +776,7 @@ public static function htaccess()
$vars['command'] = 'add_rewritebase';
$tpl['OPTION'] = PHPWS_Text::secureLink('Add RewriteBase', 'access', $vars);
} else {
- $tpl['OPTION'] = dgettext('access', 'Your .htaccess file is not writable. A RewriteBase cannot be added.');
+ $tpl['OPTION'] = 'Your .htaccess file is not writable. A RewriteBase cannot be added.';
}
}
@@ -5,10 +5,10 @@
*/
$errors = array(SHORTCUT_BAD_KEYWORD => dgettext('access', 'Bad keyword. Use only alphanumeric characters, dashes and spaces.'),
-SHORTCUT_WORD_IN_USE => dgettext('access', 'Keyword already in use. Choose another.'),
-SHORTCUT_MISSING_KEYWORD => dgettext('access', 'Missing keyword.'),
-SHORTCUT_MISSING_URL => dgettext('access', 'Missing url.'),
+SHORTCUT_WORD_IN_USE => 'Keyword already in use. Choose another.',
+SHORTCUT_MISSING_KEYWORD => 'Missing keyword.',
+SHORTCUT_MISSING_URL => 'Missing url.',
ACCESS_FILES_DIR => dgettext('access', 'The files/access/ directory is not writable.'),
-ACCESS_HTACCESS_WRITE => dgettext('access', 'Unable to write .htaccess file.'),
-ACCESS_HTACCESS_MISSING => dgettext('access', '.htaccess file is missing.')
+ACCESS_HTACCESS_WRITE => 'Unable to write .htaccess file.',
+ACCESS_HTACCESS_MISSING => '.htaccess file is missing.'
);
@@ -8,7 +8,7 @@
$link[] = array('label' => 'Analytics',
'restricted' => TRUE,
'url' => 'index.php?module=analytics&action=ShowAdminSettings',
- 'description' => dgettext('analytics', 'Integrate web tracking software into your website.'),
+ 'description' => 'Integrate web tracking software into your website.',
'image' => 'analytics.png',
'tab' => 'admin'
);
@@ -13,7 +13,7 @@ function analytics_uninstall(&$content)
PHPWS_DB::dropTable('analytics_tracker_piwik');
PHPWS_DB::dropTable('analytics_tracker_google');
PHPWS_DB::dropTable('analytics_tracker');
- $content[] = dgettext('analytics', 'Analytics tables removed.');
+ $content[] = 'Analytics tables removed.';
return TRUE;
}
@@ -8,7 +8,7 @@
'restricted' => TRUE,
'url' =>
'index.php?module=block&amp;tab=list',
- 'description' => dgettext('block', 'Create blocks of content.'),
+ 'description' => 'Create blocks of content.',
'image' => 'block.png',
'tab' => 'content'
);
@@ -11,7 +11,7 @@ function block_uninstall(&$content)
{
PHPWS_DB::dropTable('block');
PHPWS_DB::dropTable('block_pinned');
- $content[] = dgettext('block', 'Block tables removed.');
+ $content[] = 'Block tables removed.';
return true;
}
@@ -75,7 +75,7 @@ public static function route($action)
}
$block->kill();
- Block_Admin::sendMessage(dgettext('block', 'Block deleted.'));
+ Block_Admin::sendMessage('Block deleted.');
\phpws\PHPWS_Core::goBack();
break;
@@ -10,7 +10,7 @@
function blog_uninstall(&$content)
{
PHPWS_DB::dropTable('blog_entries');
- $content[] = dgettext('blog', 'Blog tables removed.');
+ $content[] = 'Blog tables removed.';
return TRUE;
}
@@ -527,7 +527,7 @@ public function post_entry()
}
if (empty($_POST['title'])) {
- $this->_error[] = dgettext('blog', 'Missing title.');
+ $this->_error[] = 'Missing title.';
} else {
$this->title = strip_tags($_POST['title']);
}
@@ -64,7 +64,7 @@ public static function main()
case 'delete':
//Blog_Admin::resetCache();
$result = $blog->delete();
- Blog_Admin::setForward(dgettext('blog', 'Blog entry deleted.'),
+ Blog_Admin::setForward('Blog entry deleted.',
'list');
break;
@@ -153,7 +153,7 @@ public static function main()
}
Blog_Admin::postSettings();
- $message = dgettext('blog', 'Blog settings saved.');
+ $message = 'Blog settings saved.';
case 'settings':
if (!Current_User::allow('blog', 'settings')) {
Current_User::disallow();
@@ -167,7 +167,7 @@ public static function main()
case 'purge_entries':
if (Current_User::authorized('blog') && Current_User::isDeity()) {
Blog_Admin::purgeEntries($_GET['pd']);
- $message = dgettext('blog', 'Blog entries purged.');
+ $message = 'Blog entries purged.';
}
$content = Blog_Form::settings();
}
@@ -15,13 +15,13 @@ public static function checkupdate($mod_title)
$file = $module->getVersionHttp();
if (empty($file)) {
- return dgettext('boost', 'Update check file not found.');
+ return 'Update check file not found.';
}
$full_xml_array = PHPWS_Text::xml2php($file, 2);
if (empty($full_xml_array)) {
- return dgettext('boost', 'Update check file not found.');
+ return 'Update check file not found.';
}
$version_info = PHPWS_Text::tagXML($full_xml_array);
@@ -77,7 +77,7 @@ public static function checkupdate($mod_title)
}
}
} else {
- $template['NO_UPDATE'] = dgettext('boost', 'No update required.');
+ $template['NO_UPDATE'] = 'No update required.';
}
$template['TITLE'] = 'Module' . ': ' . $module->getProperName(TRUE);
@@ -114,7 +114,7 @@ public function updateCore()
$ver_info = \phpws\PHPWS_Core::getVersionInfo(false);
- $content[] = dgettext('boost', 'Processing update file.');
+ $content[] = 'Processing update file.';
$result = core_update($content, $ver_info['version']);
if ($result === true) {
@@ -127,7 +127,7 @@ public function updateCore()
$content[] = dgettext('boost',
'An error occurred updating the core.');
} else {
- $content[] = dgettext('boost', 'Core successfully updated.');
+ $content[] = 'Core successfully updated.';
}
} elseif (PHPWS_Error::isError($result)) {
PHPWS_Error::log($result);
@@ -160,7 +160,7 @@ public static function showDependedUpon($base_mod)
$module = new PHPWS_Module($base_mod);
$dependents = $module->isDependedUpon();
if (empty($dependents)) {
- return dgettext('boost', 'This module does not have dependents.');
+ return 'This module does not have dependents.';
}
$template['TITLE'] = sprintf(dgettext('boost', '%s Dependencies'),
Oops, something went wrong.

0 comments on commit d2b2864

Please sign in to comment.