Changeset 10

Timestamp:

Mar 14, 2013, 11:35:29 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: České znaky v názvu ukládaných výpisů.
• Opraveno: Název exportu CVS na CSV.

Location:

trunk

Files:

• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormSettings.pas (modified) (2 diffs)
• Languages/FioInfo.cs.po (modified) (2 diffs)
• Languages/FioInfo.po (modified) (1 diff)
• Packages/CoolTranslator/Demo/Languages (modified) (1 prop)
• Packages/CoolTranslator/Demo/Languages/TranslatorDemo.cs.po (added)
• Packages/CoolTranslator/Demo/Languages/TranslatorDemo.de.po (added)
• Packages/CoolTranslator/Demo/Languages/TranslatorDemo.po (added)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (7 diffs)
• UFioAPI.pas (modified) (1 diff)

trunk/Forms/UFormMain.lfm

@@ -111 +111 @@
     Height = 65
     Top = 168
-    Width = 489
+    Width = 499
+    Anchors = [akTop, akLeft, akRight]
     Caption = 'Selected mothly report'
     ClientHeight = 46
-    ClientWidth = 485
+    ClientWidth = 495
     TabOrder = 3
     object ButtonMonthly: TButton

trunk/Forms/UFormSettings.pas

@@ -68 +68 @@
 begin
   LabeledEditToken.Text := Core.Token;
-  ComboBox1.ItemIndex := Integer(Core.Format);
+  ComboBox1.ItemIndex := Integer(Core.DataFormat);
   LabeledEditFolder.Text := Core.TargetDirectory;
 end;
@@ -75 +75 @@
 begin
   Core.Token := LabeledEditToken.Text;
-  Core.Format := TFioDataFormat(ComboBox1.ItemIndex);
+  Core.DataFormat := TFioDataFormat(ComboBox1.ItemIndex);
   Core.TargetDirectory := LabeledEditFolder.Text;
 end;

trunk/Languages/FioInfo.cs.po

@@ -44 +44 @@
 #: tcore.menuitem3.caption
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #: tformabout.buttonok.caption
@@ -158 +158 @@
 msgstr "Staşení selhalo"
 
+#: ucore.sreport
+msgid "Dump %s"
+msgstr "VÃœpis %s"
+
+#: ucore.ssavedtofile
+#| msgid "Dump saved to file to %s"
+msgid "Dump saved to file %s"
+msgstr "VÃœpis uloÅŸen do souboru %s"
+
 #: uformabout.sapplicationname
 msgid "Application name"

trunk/Languages/FioInfo.po

@@ -150 +150 @@
 msgstr ""
 
+#: ucore.sreport
+msgid "Dump %s"
+msgstr ""
+
+#: ucore.ssavedtofile
+msgid "Dump saved to file %s"
+msgstr ""
+
 #: uformabout.sapplicationname
 msgid "Application name"

trunk/UCore.lfm

@@ -391 +391 @@
     VersionMinor = 0
     VersionBugFix = 0
+    VersionSuffix = 'alfa'
     CompanyName = 'Jiří Hajda'
     CompanyHomePage = 'http://svn.zdechov.net/trac/fioinfo'

trunk/UCore.pas

@@ -50 +50 @@
     RegistryContext: TRegistryContext;
     Token: string;
-    Format: TFioDataFormat;
+    DataFormat: TFioDataFormat;
     TargetDirectory: string;
     ReportYear: Integer;
@@ -72 +72 @@
 resourcestring
   SDownloadNotSuccess = 'Download failed';
+  SReport = 'Dump %s';
+  SSavedToFile = 'Dump saved to file %s';
 
 { TCore }
@@ -105 +107 @@
     OpenKey(Context.Key, True);
     WriteString('TargetDir', TargetDirectory);
-    WriteInteger('DataFormat', Integer(Format));
+    WriteInteger('DataFormat', Integer(DataFormat));
     WriteString('Token', Token);
     WriteDate('ReportTimeFrom', ReportTimeFrom);
@@ -124 +126 @@
     OpenKey(Context.Key, True);
     TargetDirectory := ReadStringWithDefault('TargetDir', ExtractFileDir(Application.ExeName));
-    Format := TFioDataFormat(ReadIntegerWithDefault('DataFormat', Integer(dfXML)));
+    DataFormat := TFioDataFormat(ReadIntegerWithDefault('DataFormat', Integer(dfXML)));
     Token := ReadStringWithDefault('Token', '');
     ReportTimeFrom := ReadDateTimeWithDefault('ReportTimeFrom', Now);
@@ -154 +156 @@
   FioAPI: TFioAPI;
   List: TStringList;
+  FileName: string;
 begin
   FioAPI := TFioAPI.Create;
   List := TStringList.Create;
   try
-    FioAPI.Format := Format;
+    FioAPI.Format := DataFormat;
     FioAPI.Token := Token;
     if FioAPI.DownloadLast(List) then begin
-      List.SaveToFile('VÃœpis ' + FormatDateTime('yyyy-mm-dd hh-nn-ss', Now) +
-        ExtensionSeparator + DataFormatURL[FioAPI.Format]);
+      FileName := Format(SReport, [FormatDateTime('yyyy-mm-dd hh-nn-ss', Now) +
+        ExtensionSeparator + DataFormatURL[FioAPI.Format]]);
+      List.SaveToFile(UTF8Decode(FileName));
+      ShowMessage(Format(SSavedToFile, [FileName]));
     end else ShowMessage(SDownloadNotSuccess);
   finally
@@ -174 +179 @@
   FioAPI: TFioAPI;
   List: TStringList;
+  FileName: string;
 begin
   FioAPI := TFioAPI.Create;
   List := TStringList.Create;
   try
-    FioAPI.Format := Format;
+    FioAPI.Format := DataFormat;
     FioAPI.Token := Token;
     if FioAPI.DownloadMonthly(ReportYear, ReportId, List) then begin
-      List.SaveToFile('VÃœpis měsíční ' + IntToStr(ReportYear) +
+      FileName := Format(SReport, [IntToStr(ReportYear) +
         '-' + IntToStr(ReportId) +
-        ExtensionSeparator + DataFormatURL[FioAPI.Format]);
+        ExtensionSeparator + DataFormatURL[FioAPI.Format]]);
+      List.SaveToFile(UTF8Decode(FileName));
+      ShowMessage(Format(SSavedToFile, [FileName]));
     end else ShowMessage(SDownloadNotSuccess);
   finally
@@ -195 +203 @@
   FioAPI: TFioAPI;
   List: TStringList;
+  FileName: string;
 begin
   FioAPI := TFioAPI.Create;
   List := TStringList.Create;
   try
-    FioAPI.Format := Format;
+    FioAPI.Format := DataFormat;
     FioAPI.Token := Token;
     if FioAPI.DownloadInterval(ReportTimeFrom, ReportTimeTo, List) then begin
-      List.SaveToFile('VÃœpis ' + FormatDateTime('yyyy-mm-dd', ReportTimeFrom) +
+      FileName := Format(SReport, [FormatDateTime('yyyy-mm-dd', ReportTimeFrom) +
         ' ' + FormatDateTime('yyyy-mm-dd', ReportTimeTo) +
-        ExtensionSeparator + DataFormatURL[FioAPI.Format]);
+        ExtensionSeparator + DataFormatURL[FioAPI.Format]]);
+      List.SaveToFile(UTF8Decode(FileName));
+      ShowMessage(Format(SSavedToFile, [FileName]));
     end else ShowMessage(SDownloadNotSuccess);
   finally

trunk/UFioAPI.pas

@@ -26 +26 @@
 
 const
-  DataFormatText: array[TFioDataFormat] of string = ('XML', 'CVS', 'GPC', 'OFX',
+  DataFormatText: array[TFioDataFormat] of string = ('XML', 'CSV', 'GPC', 'OFX',
     'JSON', 'HTML', 'STA');
-  DataFormatURL: array[TFioDataFormat] of string = ('xml', 'cvs', 'gpc', 'ofx',
+  DataFormatURL: array[TFioDataFormat] of string = ('xml', 'csv', 'gpc', 'ofx',
     'json', 'html', 'sta');