Changeset 228 for trunk/NewView/GlobalSearchForm.pas

Timestamp:

Sep 9, 2007, 2:02:29 PM (18 years ago)

Author:

RBRi

Message:

refactoring for language handling

File:

• trunk/NewView/GlobalSearchForm.pas (modified) (3 diffs)

trunk/NewView/GlobalSearchForm.pas

@@ -318 +318 @@
 
 Procedure TGlobalSearchForm.OnLanguageEvent(Language: TLanguageFile; const Apply: boolean );
-begin
-  LogEvent(LogI18n, 'TGlobalSearchForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
+var
+  tmpPrefix : String;
+begin
+  // LogEvent(LogI18n, 'TGlobalSearchForm.OnLanguageEvent apply: "' + BoolToStr(Apply) + '"');
 
   Language.LoadComponentLanguage(self, Apply);
 
-  Language.LL(Apply, SearchCaption, 'SearchCaption', '~Search');
-  Language.LL(Apply, StopCaption, 'StopCaption', '~Stop');
-  Language.LL(Apply, NoResultsMsg, 'NoResultsMsg', '(No results found)');
-  Language.LL(Apply, ScanDirectoriesMsg, 'ScanDirectoriesMsg', 'Finding help files...');
-  Language.LL(Apply, SearchingFileMsg, 'SearchingFileMsg', 'Searching ');
-  Language.LL(Apply, OfMsg, 'OfMsg', ' of ');
-  Language.LL(Apply, DoneMsg, 'DoneMsg', 'Done');
-  Language.LL(Apply, SearchErrorTitle, 'SearchErrorTitle', 'Search');
-  Language.LL(Apply, SearchError, 'SearchError', 'Error in search syntax: ');
-
-  Language.LL(Apply, StandardHelpPathsLocation, 'StandardHelpPathsLocation', 'Standard Help Paths');
-  Language.LL(Apply, FixedDrivesLocation, 'FixedDrivesLocation', 'All Hard Drives');
-  Language.LL(Apply, SelectedHelpPathsLocation, 'SelectedHelpPathsLocation', 'Selected Help Paths');
-  Language.LL(Apply, CustomPathsLocation, 'CustomPathsLocation', 'Directory List');
+  tmpPrefix := 'GlobalSearchForm' + LANGUAGE_LABEL_DELIMITER;
+
+  Language.LL(Apply, SearchCaption, tmpPrefix + 'SearchCaption', '~Search');
+  Language.LL(Apply, StopCaption, tmpPrefix + 'StopCaption', '~Stop');
+  Language.LL(Apply, NoResultsMsg, tmpPrefix + 'NoResultsMsg', '(No results found)');
+  Language.LL(Apply, ScanDirectoriesMsg, tmpPrefix + 'ScanDirectoriesMsg', 'Finding help files...');
+  Language.LL(Apply, SearchingFileMsg, tmpPrefix + 'SearchingFileMsg', 'Searching ');
+  Language.LL(Apply, OfMsg, tmpPrefix + 'OfMsg', ' of ');
+  Language.LL(Apply, DoneMsg, tmpPrefix + 'DoneMsg', 'Done');
+  Language.LL(Apply, SearchErrorTitle, tmpPrefix + 'SearchErrorTitle', 'Search');
+  Language.LL(Apply, SearchError, tmpPrefix + 'SearchError', 'Error in search syntax: ');
+
+  Language.LL(Apply, StandardHelpPathsLocation, tmpPrefix + 'StandardHelpPathsLocation', 'Standard Help Paths');
+  Language.LL(Apply, FixedDrivesLocation, tmpPrefix + 'FixedDrivesLocation', 'All Hard Drives');
+  Language.LL(Apply, SelectedHelpPathsLocation, tmpPrefix + 'SelectedHelpPathsLocation', 'Selected Help Paths');
+  Language.LL(Apply, CustomPathsLocation, tmpPrefix + 'CustomPathsLocation', 'Directory List');
 end;
 
@@ -403 +407 @@
 Procedure TGlobalSearchForm.GlobalSearchFormOnCreate (Sender: TObject);
 Begin
-  RegisterForLanguages( OnLanguageEvent );
+  RegisterEventForLanguages( OnLanguageEvent );
 
   UpdateButtons;
@@ -749 +753 @@
   RegisterClasses ([TGlobalSearchForm, TEdit, TLabel,
     TProgressBar, TButton, TOutline2, TComboBox, TBevel, TLed, TTimer]);
-  RegisterUpdateProcForLanguages( EnsureGlobalSearchFormLoaded );
+
+  RegisterUpdateProcForLanguages(EnsureGlobalSearchFormLoaded);
 End.