Advertisement
Guest User

tt.mm.jj patch gegen master

a guest
Jun 25th, 2015
51
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Java 2.52 KB | None | 0 0
  1. diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/Messages.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/Messages.java
  2. index 6d1b975..b0aa401 100644
  3. --- a/name.abuchen.portfolio/src/name/abuchen/portfolio/Messages.java
  4. +++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/Messages.java
  5. @@ -43,9 +43,10 @@ public class Messages extends NLS
  6.      public static String CSVDefSecurityMasterData;
  7.      public static String CSVFormatDDMMYYYY;
  8.      public static String CSVFormatDDMMYYYY1;
  9. +    public static String CSVFormatDDMMYY;
  10. +    public static String CSVFormatYYYYMMDD;
  11.      public static String CSVFormatNumberGermany;
  12.      public static String CSVFormatNumberUS;
  13. -    public static String CSVFormatYYYYMMDD;
  14.      public static String CSVImportedSecurityLabel;
  15.      public static String CSVImportError;
  16.      public static String CSVImportGenericColumnLabel;
  17. diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/CSVImporter.java b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/CSVImporter.java
  18. index 5d76101..e0ce6c3 100644
  19. --- a/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/CSVImporter.java
  20. +++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/datatransfer/CSVImporter.java
  21. @@ -149,6 +149,7 @@ public class CSVImporter
  22.                          new FieldFormat(Messages.CSVFormatYYYYMMDD, new SimpleDateFormat("yyyy-MM-dd")), //$NON-NLS-1$
  23.                          new FieldFormat(Messages.CSVFormatDDMMYYYY, new SimpleDateFormat("dd.MM.yyyy")), //$NON-NLS-1$
  24.                          new FieldFormat(Messages.CSVFormatDDMMYYYY1, new SimpleDateFormat("dd/MM/yyyy")) //$NON-NLS-1$
  25. +                        new FieldFormat(Messages.CSVFormatDDMMYY, new SimpleDateFormat("dd.MM.yy")) //$NON-NLS-1$
  26.          };
  27.  
  28.          /* package */DateField(String name)
  29. diff --git a/name.abuchen.portfolio/src/name/abuchen/portfolio/messages_de.properties b/name.abuchen.portfolio/src/name/abuchen/portfolio/messages_de.properties
  30. index c48116f..fec498e 100644
  31. --- a/name.abuchen.portfolio/src/name/abuchen/portfolio/messages_de.properties
  32. +++ b/name.abuchen.portfolio/src/name/abuchen/portfolio/messages_de.properties
  33. @@ -56,12 +56,14 @@ CSVFormatDDMMYYYY = TT.MM.JJJJ
  34.  
  35.  CSVFormatDDMMYYYY1 = TT/MM/JJJJ
  36.  
  37. +CSVFormatDDMMYY = TT.MM.JJ
  38. +
  39. +CSVFormatYYYYMMDD = JJJJ-MM-TT
  40. +
  41.  CSVFormatNumberGermany = 0.000,00
  42.  
  43.  CSVFormatNumberUS = 0,000.00
  44.  
  45. -CSVFormatYYYYMMDD = JJJJ-MM-TT
  46. -
  47.  CSVImportError = Fehler bei Datensatz {0}: {1}
  48.  
  49.  CSVImportGenericColumnLabel = Spalte {0}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement