Преглед изворни кода

Merge pull request #250 from ogham/exa/issue-213

fix issue #213 iso date format inversion
Benjamin Sago пре 8 година
родитељ
комит
dd0c5f6bef
1 измењених фајлова са 8 додато и 8 уклоњено
  1. 8 8
      src/output/time.rs

+ 8 - 8
src/output/time.rs

@@ -177,14 +177,14 @@ impl ISOFormat {
         let date = LocalDateTime::at(time.seconds as i64);
         let date = LocalDateTime::at(time.seconds as i64);
 
 
         if self.is_recent(date) {
         if self.is_recent(date) {
-            format!("{:04}-{:02}-{:02}",
-                    date.year(), date.month() as usize, date.day())
-        }
-        else {
             format!("{:02}-{:02} {:02}:{:02}",
             format!("{:02}-{:02} {:02}:{:02}",
                     date.month() as usize, date.day(),
                     date.month() as usize, date.day(),
                     date.hour(), date.minute())
                     date.hour(), date.minute())
         }
         }
+        else {
+            format!("{:04}-{:02}-{:02}",
+                    date.year(), date.month() as usize, date.day())
+        }
     }
     }
 
 
     #[allow(trivial_numeric_casts)]
     #[allow(trivial_numeric_casts)]
@@ -192,13 +192,13 @@ impl ISOFormat {
         let date = zone.to_zoned(LocalDateTime::at(time.seconds as i64));
         let date = zone.to_zoned(LocalDateTime::at(time.seconds as i64));
 
 
         if self.is_recent(date) {
         if self.is_recent(date) {
-            format!("{:04}-{:02}-{:02}",
-                    date.year(), date.month() as usize, date.day())
-        }
-        else {
             format!("{:02}-{:02} {:02}:{:02}",
             format!("{:02}-{:02} {:02}:{:02}",
                     date.month() as usize, date.day(),
                     date.month() as usize, date.day(),
                     date.hour(), date.minute())
                     date.hour(), date.minute())
         }
         }
+        else {
+            format!("{:04}-{:02}-{:02}",
+                    date.year(), date.month() as usize, date.day())
+        }
     }
     }
 }
 }