mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Fix ML mass delete, enhance i18n.

Browse Source 
* Fix media library (mass) delete.

* I18n for multimove.
  + Add MEDIA_DIRECTORY_MOVE.
  + Change German translation of "Move" to
    "Verschieben".

Cherry-picked from master.

Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
Thomas Hochstein 2019-08-17 01:36:51 +02:00
parent 1bc7c4bd0f
commit 2e5e601ea2
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/NEWS
View File

@ -1,6 +1,10 @@
Version 2.3.1-beta1
------------------------------------------------------------------------
* Enhance i18n of ML multimove.
* Fix ML multidelete.
* Change footer_info and prev/next links for archive pages for
"stable archives" sort order.

2
include/admin/images.inc.php
View File

@ -132,7 +132,7 @@ switch ($serendipity['GET']['adminAction']) {
break;
}
// case bulk multimove (leave the fake oldDir being send as an empty dir)
if (isset($serendipity['POST']['newDir'])) {
if (!empty($serendipity['POST']['newDir'])) {
$messages = array();
$multiMoveImages = $serendipity['POST']['multiDelete']; // The 'multiDelete' key name should better be renamed to 'multiCheck', but this would need to change 2k11/admin/serendipity_editor.js, images.inc.tpl, media_items.tpl, media_pane.tpl and this file
unset($serendipity['POST']['multiDelete']);

3
lang/UTF-8/serendipity_lang_de.inc.php
View File

@ -1009,7 +1009,7 @@
@define('PUBLISH_ERROR', 'Fehler bei der Veröffentlichung:');
@define('UPDATE_NOTIFICATION', 'Update-Hinweis');
@define('NEW_VERSION_AVAILABLE', 'Neue stabile Serendipity version verfügbar: ');
@define('MOVE', 'Bewegen');
@define('MOVE', 'Verschieben');
@define('MOVE_UP', 'Nach oben');
@define('MOVE_DOWN', 'Nach unten');
@define('INSTALL_NEW_SIDEBAR_PLUGIN', 'Seitenleisten-Plugin installieren');
@ -1133,3 +1133,4 @@
@define('PLUGIN_LINK_SPARTACUS', 'Weitere Informationen');
@define('PLUGIN_ALL_UPDATED', 'Alle Plugins aktualisiert');
@define('MEDIA_DIRECTORY_MOVE', 'Dateien verschieben');

3
lang/serendipity_lang_de.inc.php
View File

@ -1009,7 +1009,7 @@
@define('PUBLISH_ERROR', 'Fehler bei der Veröffentlichung:');
@define('UPDATE_NOTIFICATION', 'Update-Hinweis');
@define('NEW_VERSION_AVAILABLE', 'Neue stabile Serendipity version verfügbar: ');
@define('MOVE', 'Bewegen');
@define('MOVE', 'Verschieben');
@define('MOVE_UP', 'Nach oben');
@define('MOVE_DOWN', 'Nach unten');
@define('INSTALL_NEW_SIDEBAR_PLUGIN', 'Seitenleisten-Plugin installieren');
@ -1133,3 +1133,4 @@
@define('PLUGIN_LINK_SPARTACUS', 'Weitere Informationen');
@define('PLUGIN_ALL_UPDATED', 'Alle Plugins aktualisiert');
@define('MEDIA_DIRECTORY_MOVE', 'Dateien verschieben');

1
lang/serendipity_lang_en.inc.php
View File

@ -1132,3 +1132,4 @@
@define('PLUGIN_LINK_SPARTACUS', 'More information');
@define('PLUGIN_ALL_UPDATED', 'All Plugins updated');
@define('MEDIA_DIRECTORY_MOVE', 'Move files to another directory');

2
templates/2k11/admin/media_pane.tpl
View File

@ -287,7 +287,7 @@
<input type="hidden" id="newDir" name="serendipity[newDir]">
</form>
<div id="move-popup" class="mfp-hide">
<h3>Move images to directory</h3>
<h3>{$CONST.MEDIA_DIRECTORY_MOVE}</h3>
<form>
<div class="form_select">
<select >