浏览代码

Reusing code and consequently reusing translation for one untranslated error message

Source commit: e9ae879053416cb633f43cf9bac47fdbdc7d1949
Martin Prikryl 4 年之前
父节点
当前提交
764b074f15

+ 6 - 3
source/packages/filemng/CustomDirView.pas

@@ -496,7 +496,7 @@ type
 resourcestring
   SErrorRenameFile = 'Can''t rename file or directory: ';
   SErrorRenameFileExists = 'File already exists: ';
-  SErrorInvalidName= 'Filename contains invalid characters:';
+  SErrorInvalidName = 'Filename contains invalid characters:';
   STextFileExt = 'File %s';
   STextFiles = '%u Files';
   STextDirectories = '%u Directories';
@@ -535,13 +535,16 @@ var
   DefaultExeIcon: Integer;
   UserDocumentDirectory: string;
 
+const
+  coInvalidDosChars = '\/:*?"<>|';
+  Space = ' ';
+
 implementation
 
 uses
   Math, DirViewColProperties, UITypes, Types, OperationWithTimeout, Winapi.UxTheme, Vcl.Themes;
 
 const
-  Space = ' ';
   ResDirUp = 'DIRUP%2.2d';
   ResLink = 'LINK%2.2d';
   ResBrokenLink = 'BROKEN%2.2d';
@@ -822,7 +825,7 @@ begin
   FWantUseDragImages := False;
   FAddParentDir := False;
   FullDrag := True;
-  FInvalidNameChars := '\/:*?"<>|';
+  FInvalidNameChars := coInvalidDosChars;
   FHasParentDir := False;
   FDragOnDriveIsMove := False;
   FCaseSensitive := False;

+ 0 - 2
source/packages/filemng/DirView.pas

@@ -43,8 +43,6 @@ uses
   DragDrop, Messages, ListViewColProperties, CommCtrl, DragDropFilesEx,
   FileCtrl, SysUtils, BaseUtils, Controls, CustomDriveView, System.Generics.Collections, Winapi.ShellAPI;
 
-{$I ResStrings.pas }
-
 type
   TVolumeDisplayStyle = (doPrettyName, doDisplayName); {Diplaytext of drive node}
 

+ 1 - 6
source/packages/filemng/DriveView.pas

@@ -47,8 +47,6 @@ uses
   DiscMon, IEDriveInfo, IEListView, PIDL, BaseUtils, ListExt, CustomDirView,
   CustomDriveView, System.Generics.Collections;
 
-{$I ResStrings.pas}
-
 const
   msThreadChangeDelay = 50;
 
@@ -399,9 +397,6 @@ implementation
 uses
   CompThread, PasTools, UITypes, Types, OperationWithTimeout, System.Generics.Defaults;
 
-resourcestring
-   SErrorInvalidDirName = 'New name contains invalid characters %s';
-
 type
   PInt = ^Integer;
 
@@ -819,7 +814,7 @@ begin
         System.Insert(Space, Info, i);
 
       if Length(Item.pszText) > 0 then
-        raise EInvalidDirName.CreateFmt(SErrorInvalidDirName, [Info]);
+        raise EInvalidDirName.Create(SErrorInvalidName + Space + Info);
       Exit;
     end;
 

+ 0 - 4
source/packages/filemng/ResStrings.pas

@@ -1,4 +0,0 @@
-resourcestring
-   coFileOperatorTitle = 'Filesystem Operation';
-   coInvalidDosChars   = '\/:*?"<>|';
-   Space               = ' ';