mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-22 13:41:52 +02:00
Code Issues Releases Wiki Activity

Merge pull request from lonalore/master

Browse Source 
Issue : Remove and optimize (hardcoded) LANS
This commit is contained in:
Cameron 2015-05-08 10:14:24 -07:00
commit c92cd34008
6 changed files with 10 additions and 10 deletions

6
e107_admin/image.php

@ -727,7 +727,7 @@ class media_admin_ui extends e_admin_ui
'thumbnail_quality' => array('title'=> IMALAN_73, 'type'=>'number', 'data'=>'int', 'writeParms'=>'help=IMALAN_74'),
'im_width' => array('title'=> IMALAN_75, 'type'=>'number', 'data'=>'int', 'writeParms'=>'help=IMALAN_76'),
'im_height' => array('title'=> IMALAN_77, 'type'=>'number', 'data'=>'int', 'writeParms'=>'help=IMALAN_78'),
'im_height' => array('title'=> IMALAN_77, 'type'=>'number', 'data'=>'int', 'writeParms'=>'help=IMALAN_76'),
'resize_dimensions' => array('title'=> IMALAN_79, 'type'=>'method', 'data'=>'str'),
'watermark_activate' => array('title'=> IMALAN_80, 'tab'=>1, 'type' => 'number', 'data' => 'str', 'help'=>IMALAN_81), // 'validate' => 'regex', 'rule' => '#^[\d]+$#i', 'help' => 'allowed characters are a-zA-Z and underscore')),
@ -735,7 +735,7 @@ class media_admin_ui extends e_admin_ui
'watermark_font' => array('title'=> IMALAN_84,'tab'=>1, 'type' => 'dropdown', 'data' => 'str', 'help'=>IMALAN_85), // 'validate' => 'regex', 'rule' => '#^[\d]+$#i', 'help' => 'allowed characters are a-zA-Z and underscore')),
'watermark_size' => array('title'=> IMALAN_86, 'tab'=>1,'type' => 'number', 'data' => 'int', 'help'=>IMALAN_87), // 'validate' => 'regex', 'rule' => '#^[\d]+$#i', 'help' => 'allowed characters are a-zA-Z and underscore')),
'watermark_pos' => array('title'=> IMALAN_88,'tab'=>1, 'type' => 'dropdown', 'data' => 'str', 'help'=>IMALAN_89), // 'validate' => 'regex', 'rule' => '#^[\d]+$#i', 'help' => 'allowed characters are a-zA-Z and underscore')),
'watermark_pos' => array('title'=> IMALAN_88,'tab'=>1, 'type' => 'dropdown', 'data' => 'str', 'help'=>IMALAN_88), // 'validate' => 'regex', 'rule' => '#^[\d]+$#i', 'help' => 'allowed characters are a-zA-Z and underscore')),
'watermark_margin' => array('title'=> IMALAN_90, 'tab'=>1,'type' => 'number', 'data' => 'int', 'help'=>IMALAN_91), // 'validate' => 'regex', 'rule' => '#^[\d]+$#i', 'help' => 'allowed characters are a-zA-Z and underscore')),
'watermark_color' => array('title'=> IMALAN_92, 'tab'=>1, 'type' => 'text', 'data' => 'str', 'help'=>IMALAN_93), // 'validate' => 'regex', 'rule' => '#^[\d]+$#i', 'help' => 'allowed characters are a-zA-Z and underscore')),
@ -1839,7 +1839,7 @@ class media_admin_ui extends e_admin_ui
{
$srch = array('[x]','[y]');
$repl = array($oldpath,str_replace('../', '', $newpath));
$text = str_replace($srch,$repl,IMALAN_110);
$text = str_replace($srch,$repl,IMALAN_108);
$mes->add($text, E_MESSAGE_ERROR);
return FALSE;
}

2
e107_admin/language.php

@ -1412,7 +1412,7 @@ function zip_up_lang($language)
$ret['error'] = TRUE;
$ret['message'] = (defined("LANG_LAN_29")) ? LANG_LAN_29 : LANG_LAN_117;
$ret['message'] .= "<br />";
$ret['message'] .= (defined('LANG_LAN_27')) ? LANG_LAN_27 : LANG_LAN_118;
$ret['message'] .= (defined('LANG_LAN_27')) ? LANG_LAN_27 : LANG_LAN_116;
return $ret;
}

2
e107_admin/newspost.php

@ -147,7 +147,7 @@ class news_cat_ui extends e_admin_ui
$sef = e107::getParser()->toDB($new_data['category_sef']);
if(e107::getDb()->count('news_category', '(*)', "category_sef='{$sef}' AND category_id!=".intval($id)))
{
e107::getMessage()->addError(LAN_NEWS_66);
e107::getMessage()->addError(LAN_NEWS_65);
return false;
}
return $new_data;

6
e107_languages/English/admin/lan_image.php

@ -112,7 +112,7 @@ define('IMALAN_74', "Set this as low as possible before quality loss is apparent
define('IMALAN_75', "Avatar Width");
define('IMALAN_76', "Avatar images will be constrained to these dimensions (in pixels)");
define('IMALAN_77', "Avatar Height");
define('IMALAN_78', "Avatar images will be constrained to these dimensions (in pixels)");
define('IMALAN_78', ""); // Unused
define('IMALAN_79', "Resize-Image Dimensions");
define('IMALAN_80', "Watermark Activation");
define('IMALAN_81', "All images with a width or height greater than this value will be given a watermark during resizing.");
@ -123,7 +123,7 @@ define('IMALAN_85', "Optional Watermark Font. Upload more .ttf fonts to the /fon
define('IMALAN_86', "Watermark Size");
define('IMALAN_87', "Size of the font in pts");
define('IMALAN_88', "Watermark Position");
define('IMALAN_89', "Watermark Position");
define('IMALAN_89', ""); // Unused
define('IMALAN_90', "Watermark Margin");
define('IMALAN_91', "The distance that watermark will appear from the edge of the image.");
define('IMALAN_92', "Watermark Color");
@ -144,7 +144,7 @@ define('IMALAN_106', "Leave empty to disable");
define('IMALAN_107', "Couldn't generated path from upload data");
define('IMALAN_108', "Couldn't move file from [x] to [y]");
define('IMALAN_109', "Couldn't get path");
define('IMALAN_110', "Couldn't move file from [x] to [y]");
define('IMALAN_110', ""); // Unused
define('IMALAN_111', "Couldn't detect mime-type([x]). Upload failed.");
define('IMALAN_112', "Couldn't create folder ([x]).");
define('IMALAN_113', "Scanning for new media (images, videos, files) in folder:");

2
e107_languages/English/admin/lan_language.php

@ -77,7 +77,7 @@ define("LANG_LAN_114", "Download Pack");
define("LANG_LAN_115", "Please verify and correct the remaining [x] error(s) before attempting to create a language-pack.");
define("LANG_LAN_116", "Please verify your language files ('Verify') then try again.");
define("LANG_LAN_117", "You should correct the remaining errors before contributing your language pack.");
define("LANG_LAN_118", "Please verify your language files ('Verify') then try again.");
define("LANG_LAN_118", ""); // Unused
define("LANG_LAN_119", "Please check that CORE_LC and CORE_LC2 have values in [x] and try again.");
define("LANG_LAN_120", "Please make sure you are using default folder names in e107_config.php (eg. e107_languages/, e107_plugins/ etc.) and try again.");
define("LANG_LAN_121", "Couldn't Load:");

2
e107_languages/English/admin/lan_newspost.php

@ -197,7 +197,7 @@ define("LAN_NEWS_62", "Error accessing database, or no news items found");
define("LAN_NEWS_63", "Create Category");
define("LAN_NEWS_64", "Old Submitted");
define("LAN_NEWS_65", "Please choose unique SEF URL string for this category");
define("LAN_NEWS_66", "Please choose unique SEF URL string for this category");
define("LAN_NEWS_66", ""); // Unused
define("LAN_NEWS_67", "Close");
define("LAN_NEWS_68", "Submitted Item");