Udapted Copy & Paste messages

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9239 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/ihtml/themes/default/copyPasteDialog.tpl b/gosa-core/ihtml/themes/default/copyPasteDialog.tpl
index 9926c7f50afb3b3871d0a01daeb4b3669acff893..a43275e2aba4d5c2862f1b1125275a865ffdb137 100644 (file)
--- a/gosa-core/ihtml/themes/default/copyPasteDialog.tpl
+++ b/gosa-core/ihtml/themes/default/copyPasteDialog.tpl
@@ -17,7 +17,7 @@
 
        <div style='text-align:right;width:100%;'>
                <input type='submit' name='PerformCopyPaste' value='{t}Save{/t}'>&nbsp;
-       {if $type == "copy"}
+       {if $type == "modified"}
                <input type='submit' name='abort_current_cut-copy_operation' value='{t}Cancel{/t}'>
        {/if}
        

diff --git a/gosa-core/include/class_CopyPasteHandler.inc b/gosa-core/include/class_CopyPasteHandler.inc
index b780517f5c791fa2f74c67668e62c67a50ddfb8a..06006fbefab3cf2d31bcf13b903480ed39f73301 100644 (file)
--- a/gosa-core/include/class_CopyPasteHandler.inc
+++ b/gosa-core/include/class_CopyPasteHandler.inc
@@ -340,12 +340,12 @@ class CopyPasteHandler {
         $dns .= $entry['dn']."\n";
       }
       $smarty = get_smarty();
-      $smarty->assign("type","cut");
+      $smarty->assign("type","directly");
       $smarty->assign("Complete",false);
       $smarty->assign("AttributesToFix"," ");
       $smarty->assign("SubDialog","");
       $smarty->assign("objectDN" ,$dns);
-      $smarty->assign("message"  , sprintf(_("You are going to paste the cutted entry '%s'."), "<pre>".$dns."</pre>"));
+      $smarty->assign("message"  , sprintf(_("You are going to paste the following entries '%s'."), "<pre>".$dns."</pre>"));
       return($smarty->fetch(get_template_path("copyPasteDialog.tpl",FALSE)));
     }
 
@@ -363,12 +363,12 @@ class CopyPasteHandler {
       }
       if($this->current){
         $smarty = get_smarty();
-        $smarty->assign("type","copy");
+        $smarty->assign("type","modified");
         $smarty->assign("Complete",false);
         $smarty->assign("AttributesToFix",$this->generateAttributesToFix());
         $smarty->assign("SubDialog",$this->current['object']->SubDialog);
         $smarty->assign("objectDN",$this->current['source_data']['dn']);
-        $smarty->assign("message", sprintf(_("You are going to paste the copied entry '%s'."), $this->current['source_data']['dn']));
+        $smarty->assign("message", sprintf(_("You are going to paste the following entry '%s'."), $this->current['source_data']['dn']));
         return($smarty->fetch(get_template_path("copyPasteDialog.tpl",FALSE)));
       }
     }