IDE: replaced formatting arguments with line breaks in license notices, patch by Vaclav Valicek with some changes, bug #26394

git-svn-id: trunk@45754 -

ide/lazarusidestrconsts.pas

@@ -1041,54 +1041,43 @@ resourcestring
   lisHintStepOut  = 'Run until function returns';
 
   lisGPLNotice =
-    '<description>'
-   +'%s'
-   +'Copyright (C) <year> <name of author> <contact>'
-   +'%s'
+    '<description>' + sLineBreak + sLineBreak
+   +'Copyright (C) <year> <name of author> <contact>'  + sLineBreak + sLineBreak
    +'This source is free software; you can redistribute it and/or modify '
    +'it under the terms of the GNU General Public License as published by '
    +'the Free Software Foundation; either version 2 of the License, or '
-   +'(at your option) any later version. '
-   +'%s'
+   +'(at your option) any later version. '  + sLineBreak + sLineBreak
    +'This code is distributed in the hope that it will be useful, but '
    +'WITHOUT ANY WARRANTY; without even the implied warranty of '
    +'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU '
-   +'General Public License for more details. '
-   +'%s'
+   +'General Public License for more details. ' + sLineBreak + sLineBreak
    +'A copy of the GNU General Public License is available on the World '
    +'Wide Web at <http://www.gnu.org/copyleft/gpl.html>. You can also '
    +'obtain it by writing to the Free Software Foundation, '
    +'Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.';
 
   lisLGPLNotice =
-    '<description>'
-   +'%s'
-   +'Copyright (C) <year> <name of author> <contact>'
-   +'%s'
+    '<description>' + sLineBreak + sLineBreak
+   +'Copyright (C) <year> <name of author> <contact>'  + sLineBreak + sLineBreak
    +'This library is free software; you can redistribute it and/or modify '
    +'it under the terms of the GNU Library General Public License as published '
    +'by the Free Software Foundation; either version 2 of the License, or '
-   +'(at your option) any later version. '
-   +'%s'
+   +'(at your option) any later version. ' + sLineBreak + sLineBreak
    +'This program is distributed in the hope that it will be useful, '
    +'but WITHOUT ANY WARRANTY; without even the implied warranty of '
    +'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the '
-   +'GNU Library General Public License for more details. '
-   +'%s'
+   +'GNU Library General Public License for more details. ' + sLineBreak + sLineBreak
    +'You should have received a copy of the GNU Library General Public License '
    +'along with this library; if not, write to the Free Software '
    +'Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.';
 
   lisModifiedLGPLNotice =
-    '<description>'
-   +'%s'
-   +'Copyright (C) <year> <name of author> <contact>'
-   +'%s'
+    '<description>' + sLineBreak + sLineBreak
+   +'Copyright (C) <year> <name of author> <contact>' + sLineBreak + sLineBreak
    +'This library is free software; you can redistribute it and/or modify '
    +'it under the terms of the GNU Library General Public License as published '
    +'by the Free Software Foundation; either version 2 of the License, or '
-   +'(at your option) any later version with the following modification:'
-   +'%s'
+   +'(at your option) any later version with the following modification:' + sLineBreak + sLineBreak
    +'As a special exception, the copyright holders of this library give you '
    +'permission to link this library with independent modules to produce an '
    +'executable, regardless of the license terms of these independent modules,'
@@ -1098,33 +1087,27 @@ resourcestring
    +'module is a module which is not derived from or based on this library. If '
    +'you modify this library, you may extend this exception to your version of '
    +'the library, but you are not obligated to do so. If you do not wish to do '
-   +'so, delete this exception statement from your version.'
-   +'%s'
+   +'so, delete this exception statement from your version.' + sLineBreak + sLineBreak
    +'This program is distributed in the hope that it will be useful, '
    +'but WITHOUT ANY WARRANTY; without even the implied warranty of '
    +'MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the '
-   +'GNU Library General Public License for more details. '
-   +'%s'
+   +'GNU Library General Public License for more details. ' + sLineBreak + sLineBreak
    +'You should have received a copy of the GNU Library General Public License '
    +'along with this library; if not, write to the Free Software '
    +'Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.';
 
   // MIT license aka Expat license see: http://www.opensource.org/licenses/MIT
   lisMITNotice =
-    '<description>'
-    +'%s'
-    +'Copyright (c) <year> <copyright holders>'
-    +'%s'
+    '<description>' + sLineBreak + sLineBreak
+    +'Copyright (c) <year> <copyright holders>' + sLineBreak + sLineBreak
     +'Permission is hereby granted, free of charge, to any person obtaining a copy of '
     +'this software and associated documentation files (the "Software"), to deal in '
     +'the Software without restriction, including without limitation the rights to '
     +'use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of '
     +'the Software, and to permit persons to whom the Software is furnished to do so, '
-    +'subject to the following conditions:'
-    +'%s'
+    +'subject to the following conditions:' + sLineBreak + sLineBreak
     +'The above copyright notice and this permission notice shall be included in all '
-    +'copies or substantial portions of the Software.'
-    +'%s'
+    +'copies or substantial portions of the Software.' + sLineBreak + sLineBreak
     +'THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR '
     +'IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, '
     +'FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE '

ide/sourceeditor.pp

@@ -4022,9 +4022,7 @@ var
   Txt: string;
 begin
   if ReadOnly then Exit;
-  Txt:=CommentText(LCLProc.BreakString(
-            StringReplace(Notice, '%s', sLineBreak, [rfReplaceAll]),
-            FEditor.RightEdge-2,0),CommentType);
+  Txt:=CommentText(LCLProc.BreakString(Notice, FEditor.RightEdge-2,0),CommentType);
   FEditor.InsertTextAtCaret(Txt);
 end;