From ad93cb251c2289b1161559521e9c53f05b08e37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Wed, 2 Nov 2016 09:29:18 +0100 Subject: [PATCH 1/2] Update image.php Some corrections and add lang codes. --- e107_admin/image.php | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/e107_admin/image.php b/e107_admin/image.php index 23eaf56a5..e4bf5a587 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -692,10 +692,10 @@ class media_admin_ui extends e_admin_ui // protected $defaultOrder = 'desc'; protected $listOrder = 'm.media_id desc'; // show newest images first. public $deleteConfirmScreen = true; - public $deleteConfirmMessage = 'You are about to delete [x] records and ALL CORRESPONDING FILES! Please confirm to continue!'; + public $deleteConfirmMessage = IMALAN_129; - protected $preftabs = array('General',"Watermark", "Youtube"); + protected $preftabs = array(IMALAN_78,IMALAN_89, "Youtube"); protected $fields = array( 'checkboxes' => array('title'=> '', 'type' => null, 'data'=> null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'), @@ -1313,10 +1313,10 @@ class media_admin_ui extends e_admin_ui $text .= "
"; @@ -1568,12 +1568,10 @@ class media_admin_ui extends e_admin_ui } else // empty key. { - $items = "

Youtube search requires a (free) YouTube v3 api key.
- This key is not required unless you wish to perform a keyword, playlist or channel search.
- Entering a Youtube video URL directly into the box above will still work without having an api key.
- Click here for more information and to enter your api key. -

-
"; + $link = ''.IMALAN_177.''; + $items = "

".e107::getParser()->lanVars(e107::getParser()->toHTML(IMALAN_174, true), array('x'=>$link))."

"; + + } } @@ -1603,7 +1601,7 @@ class media_admin_ui extends e_admin_ui } // return print_a($data,true); - $parms = array('width' => 200, 'height'=>113, 'type'=>'image', 'bbcode'=>'video', 'tagid'=> $this->getQuery('tagid'), 'action'=>'youtube','searchPlaceholder'=>'Search Youtube. Paste any YouTube URL here for a specific video/playlist/channel' ); + $parms = array('width' => 200, 'height'=>113, 'type'=>'image', 'bbcode'=>'video', 'tagid'=> $this->getQuery('tagid'), 'action'=>'youtube','searchPlaceholder'=>IMALAN_175 ); $text = e107::getMedia()->browserCarousel($items, $parms); if(E107_DEBUG_LEVEL > 0 && !empty($feed)) @@ -1659,7 +1657,7 @@ class media_admin_ui extends e_admin_ui if(!$fl->getRemoteFile($_POST['upload_url'], $fileName, 'import')) { - $mes->addError("There was a problem grabbing the file"); + $mes->addError(IMALAN_176); } elseif($import == true) { @@ -2445,8 +2443,8 @@ class media_admin_ui extends e_admin_ui // ".$frm->textarea('batch_import_diz['.$c.']', ($_POST['batch_import_diz'][$c] ? $_POST['batch_import_diz'][$c] : $default['description']))." - $this->cats['_avatars_public'] = "Avatars Folder (user selectable)"; - $this->cats['_avatars_private'] = "Avatars Folder (private)"; + $this->cats['_avatars_public'] = IMALAN_178; + $this->cats['_avatars_private'] = IMALAN_179; if(!isset($_POST['batch_category']) && substr($lastMime,0,5)=='image') { From a5f45d8d2e7a95ded4979641d1fa4db7cda980af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor?= Date: Wed, 2 Nov 2016 10:17:49 +0100 Subject: [PATCH 2/2] Update lan_image.php --- e107_languages/English/admin/lan_image.php | 25 +++++----------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/e107_languages/English/admin/lan_image.php b/e107_languages/English/admin/lan_image.php index ee9ea32e5..be2466c5e 100644 --- a/e107_languages/English/admin/lan_image.php +++ b/e107_languages/English/admin/lan_image.php @@ -5,21 +5,17 @@ * Admin Language File * */ - // Menu define("LAN_IMA_M_01", "Media Library"); define("LAN_IMA_M_02", "Media Upload/Import"); define("LAN_IMA_M_03", "Media Categories"); define("LAN_IMA_M_04", "Create Category"); define("LAN_IMA_M_05", "Avatars"); - - // Errors / Info / Notices define("LAN_IMA_001", "Modification is not permitted."); define("LAN_IMA_002", "Not enough memory available to rotate"); define("LAN_IMA_003", "Rotated"); define("LAN_IMA_004", "Resizing"); - // Options define("LAN_IMA_O_001", "News Images"); define("LAN_IMA_O_002", "News [img] bbcode"); @@ -27,9 +23,7 @@ define("LAN_IMA_O_003", "Page [img] bbcode"); define("LAN_IMA_O_004", "Featurebox Images"); define("LAN_IMA_O_005", "Featurebox [img] bbcode"); define("LAN_IMA_O_006", "[img] bbcode"); - // Work in progress (Moc) - define("IMALAN_1", "Enable image display"); define("IMALAN_2", "Display images, this will apply sitewide (comments, chatbox etc) to images posted using the [img] bbcode"); define("IMALAN_3", "Resize method"); @@ -56,7 +50,6 @@ define("IMALAN_23", "Avatars"); define("IMALAN_24", "Photograph"); define("IMALAN_25", "Click here to delete all unused images"); define("IMALAN_26", "image(s) deleted"); - define("IMALAN_28", "deleted"); define("IMALAN_29", "No images"); // define("IMALAN_30", "Everyone (public)"); @@ -65,7 +58,6 @@ define("IMALAN_29", "No images"); // define("IMALAN_33", "Admin only"); //define("IMALAN_34", "Enable PNG Fix"); //define("IMALAN_35", "Fixes transparent PNG-24's with alpha transparency in IE 5 / 6 (Applies Sitewide)"); - define("IMALAN_36", "Validate avatar size and access"); define("IMALAN_37", "Avatar Validation"); define("IMALAN_38", "Maximum allowable width"); @@ -82,31 +74,23 @@ define("IMALAN_48", "Total external avatars"); define("IMALAN_49", "Users with avatars"); define("IMALAN_50", "Total"); define("IMALAN_51", "Avatar for "); - define("IMALAN_52", "Path to ImageMagick appears to be incorrect"); define("IMALAN_53", "Path to ImageMagick appears to be correct, but convert file may not be valid"); define("IMALAN_54", "GD version installed:"); define('IMALAN_55', "Not installed"); - //v0.8 - //uploaded avatar list define('IMALAN_56', "Click to select"); define('IMALAN_57', "Image too big - click to enlarge"); - //avatar check // define('IMALAN_61', "Options"); define('IMALAN_62', "Reason"); - define('IMALAN_65', "Nothing found"); - define('IMALAN_66', "Filename"); define('IMALAN_68', "Close"); define('IMALAN_69', "Folder"); define('IMALAN_70', "Non-system folder is found!"); - // define("IMALAN_72", "Icons"); - define('IMALAN_73', "Thumbnail Quality"); define('IMALAN_74', "Set this as low as possible before quality loss is apparent. Max. 100"); define('IMALAN_75', "Avatar Width"); @@ -198,7 +182,7 @@ define('IMALAN_160', "Margin-Top"); define('IMALAN_161', "Margin-Bottom"); define('IMALAN_162', "Displaying [x] - [y] of [z] images."); define('IMALAN_163', "Video"); -define('IMALAN_164', ""); // Unused +define('IMALAN_164', "Deleted Icons from Media-Manager"); define('IMALAN_165', "No images"); define('IMALAN_166', "Upload images or files"); define('IMALAN_167', "No file"); @@ -208,7 +192,8 @@ define('IMALAN_170', "Choose this avatar"); define('IMALAN_171', "Admin-Only Notice: The folder"); define('IMALAN_172', "is empty. Upload some default avatars images to this folder for users to choose avatars from."); define('IMALAN_173', "No media owner found."); - - - +define('IMALAN_174', "Youtube search requires a (free) YouTube v3 api key.[br]This key is not required unless you wish to perform a keyword, playlist or channel search.[br]Entering a Youtube video URL directly into the box above will still work without having an api key.[br][x]"); +define('IMALAN_175', "Search Youtube. Paste any YouTube URL here for a specific video/playlist/channel"); +define('IMALAN_176', "There was a problem grabbing the file"); +define('IMALAN_177', "Click here for more information and to enter your api key"); ?>