From 9e9a0f5ca8df5779b23ea7387a374acdc2ff8b29 Mon Sep 17 00:00:00 2001 From: maxim Date: Sat, 20 Mar 2010 18:56:57 +0000 Subject: [PATCH] JCF2: localized Returns tab git-svn-id: trunk@24117 - --- .../jcf2/IdePlugin/lazarus/jcfuiconsts.pas | 18 ++++++++++++++++ .../jcf2/Ui/Settings/frClarifyReturns.pas | 21 ++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas b/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas index 605ab0ac67..f762e909af 100644 --- a/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas +++ b/components/jcf2/IdePlugin/lazarus/jcfuiconsts.pas @@ -140,6 +140,24 @@ resourcestring lisLBUsuallyUnlessThereIsNoAcceptablePlaceToBreak = '&Usually, unless there ' +'is no acceptable place to break'; + //Returns tab + lisReturnsReturns = 'Returns'; + lisReturnsRemoveReturns = 'Remove returns'; + lisReturnsInMiscBadPlaces = 'In misc. bad places'; + lisReturnsInProperties = 'In properties'; + lisReturnsInProcedureDefinitions = 'In procedure definitions'; + lisReturnsInVariableDeclarations = 'In variable declarations'; + lisReturnsInExpressions = 'In expressions'; + lisReturnsInsertReturns = 'Insert returns'; + lisReturnsInMiscGoodPlaces = 'In misc. good places'; + lisReturnsOneUsesClauseItemPerLine = 'One uses clause item per line'; + lisReturnsAfterUses = 'After uses'; + lisReturnsReturnChars = 'Return chars'; + lisReturnsLeaveAsIs = 'Leave as is'; + lisReturnsConvertToCarriageReturn = 'Convert to Carriage Return (UNIX)'; + lisReturnsConvertToCarriageReturnLinefeed = 'Convert to Carriage Return + ' + +'Linefeed (DOS/Windows)'; + implementation end. diff --git a/components/jcf2/Ui/Settings/frClarifyReturns.pas b/components/jcf2/Ui/Settings/frClarifyReturns.pas index c3dbda47f2..0fc1053bd3 100644 --- a/components/jcf2/Ui/Settings/frClarifyReturns.pas +++ b/components/jcf2/Ui/Settings/frClarifyReturns.pas @@ -66,7 +66,7 @@ implementation {$R *.lfm} uses - SettingsTypes, JcfSettings, SetReturns, JcfHelp; + SettingsTypes, JcfSettings, SetReturns, JcfHelp, jcfuiconsts; constructor TfClarifyReturns.Create(AOwner: TComponent); @@ -77,12 +77,27 @@ end; function TfClarifyReturns.GetTitle: String; begin - Result := 'Returns'; + Result := lisReturnsReturns; end; procedure TfClarifyReturns.Setup(ADialog: TAbstractOptionsEditorDialog); begin - // + gbRemoveReturns.Caption := lisReturnsRemoveReturns; + cbRemoveReturns.Caption := lisReturnsInMiscBadPlaces; + cbRemovePropertyReturns.Caption := lisReturnsInProperties; + cbRemoveProcDefReturns.Caption := lisReturnsInProcedureDefinitions; + cbRemoveVarReturns.Caption := lisReturnsInVariableDeclarations; + cbRemoveExprReturns.Caption := lisReturnsInExpressions; + + gbInsert.Caption := lisReturnsInsertReturns; + cbInsertReturns.Caption := lisReturnsInMiscGoodPlaces; + cbUsesClauseOnePerLine.Caption := lisReturnsOneUsesClauseItemPerLine; + cbBreakAfterUses.Caption := lisReturnsAfterUses; + + rgReturnChars.Caption := lisReturnsReturnChars; + rgReturnChars.Items[0] := lisReturnsLeaveAsIs; + rgReturnChars.Items[1] := lisReturnsConvertToCarriageReturn; + rgReturnChars.Items[2] := lisReturnsConvertToCarriageReturnLinefeed; end; {-------------------------------------------------------------------------------