Merge branch 'feature_page_patternreplacement'

Author: fstorck

action.php

@@ -53,13 +53,13 @@ public function handle_ajax_call_unknown(Doku_Event &$event, $param) {
                              '@NS@',
                              '@ID@',
                              '@USER@',
-							 '@PAGE@'
+                             '@PAGE@'
                         ),
                         array(
                              getNS($INPUT->post->str('id')),
                              $INPUT->post->str('id'),
                              $_SERVER['REMOTE_USER'],
-							 noNS($INPUT->post->str('id'))
+                             noNS($INPUT->post->str('id'))
                         ),
                         $filename
                     );

lang/en/settings.php

@@ -6,7 +6,7 @@
  */
 
 // keys need to match the config setting name
-$lang['filename'] = 'How to name pasted images. You can use the placeholders @USER@, @NS@, @ID@ and strftime placeholders. The file extension is added automatically.';
+$lang['filename'] = 'How to name pasted images. You can use the placeholders @USER@, @NS@, @ID@, @PAGE@ and strftime placeholders. The file extension is added automatically.';
 
 
 

lang/fr/settings.php

@@ -6,6 +6,6 @@
  */
 
 // keys need to match the config setting name
-$lang['filename'] = 'Comment nommer les images collées. Vous pouvez utiliser les motifs @USER@, @NS@, @ID@, ansi que des formats de strftime. Imgpaste ajoutera automatiquement la bonne extension au nom du fichier.';
+$lang['filename'] = 'Comment nommer les images collées. Vous pouvez utiliser les motifs @USER@, @NS@, @ID@, @PAGE@ ansi que des formats de strftime. Imgpaste ajoutera automatiquement la bonne extension au nom du fichier.';
 
 //Setup VIM: ex: et ts=4 :

lang/ko/settings.php

@@ -6,7 +6,7 @@
  */
 
 // keys need to match the config setting name
-$lang['filename'] = '올린 파일의 이름. 대체 문자열 @USER@, @NS@, @ID@, strftime을 사용할 수 있습니다. 파일확장자는 자동으로 더해집니다.';
+$lang['filename'] = '올린 파일의 이름. 대체 문자열 @USER@, @NS@, @ID@, @PAGE@, strftime을 사용할 수 있습니다. 파일확장자는 자동으로 더해집니다.';
 
 
 

plugin.info.txt

@@ -1,11 +1,7 @@
 base   imgpaste
 author Andreas Gohr
 email  [email protected]
-<<<<<<< HEAD
-date   2016-09-20
-=======
-date   2017-09-24
->>>>>>> 02d362229275b1bdd8bf705f313142c5ebef8a51
+date   2018-05-03
 name   imgpaste plugin
-desc   Add images via cut'n'paste in Chrome 
+desc   Add images via cut'n'paste in Chrome
 url    http://www.dokuwiki.org/plugin:imgpaste