mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

remove duplication

Browse Source
This commit is contained in:
Lóna Lore
2015-05-08 10:49:52 +02:00
parent 7eedeb8237
commit d25fd99fbb
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_admin/image.php
View File

@@ -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;
}

6
e107_languages/English/admin/lan_image.php
View File

@@ -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:");