Ver Fonte

Fixed a problem with dates. Increased version number.

Iñigo Valentin há 8 anos atrás
pai
commit
cacb06dbc3

+ 7 - 7
app/ActivitiesView.swift

@@ -115,12 +115,7 @@ class ActivitiesView: UIView {
 					row = RowFutureActivity.init(s: "rowFutureActivity\(count)", i: count)
 					id = r.value(forKey: "id")! as! Int
 					title = r.value(forKey: "title_\(lang!)")! as! String
-                    if ((r.value(forKey: "after_\(lang)") != nil) && ((r.value(forKey: "after_\(lang)")! as! String).length != 0)){
-                        text = r.value(forKey: "after_\(lang)")! as! String
-                    }
-                    else{
-                        text = r.value(forKey: "text_\(lang)")! as! String
-                    }
+                    text = r.value(forKey: "text_\(lang!)")! as! String
 					city = r.value(forKey: "city")! as! String
 					price = r.value(forKey: "price")! as! Int
 					date = r.value(forKey: "date")! as! NSDate
@@ -185,7 +180,12 @@ class ActivitiesView: UIView {
 				row = RowPastActivity.init(s: "rowPastActivity\(count)", i: count)
 				id = r.value(forKey: "id")! as! Int
 				title = r.value(forKey: "title_\(lang!)")! as! String
-				text = r.value(forKey: "text_\(lang!)")! as! String
+                if ((r.value(forKey: "after_\(lang!)") != nil) && ((r.value(forKey: "after_\(lang!)")! as! String).length != 0)){
+                    text = r.value(forKey: "after_\(lang!)")! as! String
+                }
+                else{
+                    text = r.value(forKey: "text_\(lang!)")! as! String
+                }
 				row.setTitle(text: title)
 				row.setText(text: text)
 				row.id = id

+ 1 - 1
app/FutureActivityViewController.swift

@@ -231,7 +231,7 @@ class FutureActivityViewController: UIViewController, UIGestureRecognizerDelegat
 				dayNum = "3rd"
 				break;
 			default:
-				dayNum = "\(weekday)th"
+				dayNum = "\(day)th"
 			}
 			
 			strDate = "\(days_en[weekday]), \(months_en[month]) \(dayNum)"

+ 2 - 2
app/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleVersion</key>
-	<string>18</string>
+	<string>19</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationWhenInUseUsageDescription</key>

+ 1 - 1
app/PastActivityViewController.swift

@@ -174,7 +174,7 @@ class PastActivityViewController: UIViewController, UIGestureRecognizerDelegate
 				dayNum = "3rd"
 				break;
 			default:
-				dayNum = "\(weekday)th"
+				dayNum = "\(day)th"
 			}
 			
 			strDate = "\(days_en[weekday]), \(months_en[month]) \(dayNum)"

+ 1 - 1
app/PhotoViewController.swift

@@ -260,7 +260,7 @@ class PhotoViewController: UIViewController, UIGestureRecognizerDelegate {
 				dayNum = "3rd"
 				break;
 			default:
-				dayNum = "\(weekday)th"
+				dayNum = "\(day)th"
 			}
 			
 			strDate = "\(days_en[weekday]), \(months_en[month]) \(dayNum), \(year)"

+ 1 - 1
app/PostViewController.swift

@@ -176,7 +176,7 @@ class PostViewController: UIViewController, UIGestureRecognizerDelegate {
                 dayNum = "3rd"
                 break;
             default:
-                dayNum = "\(weekday)th"
+                dayNum = "\(day)th"
             }
             
             strDate = "\(days_en[weekday]), \(months_en[month]) \(dayNum)"

+ 1 - 1
app/RowFutureActivity.swift

@@ -168,7 +168,7 @@ Extension of UIView to be formatted as future activity rows.
 						dayNum = "3rd"
 						break;
 					default:
-						dayNum = "\(weekday)th"
+						dayNum = "\(day)th"
 				}
 				
 				strDate = "\(days_en[weekday]), \(months_en[month]) \(dayNum)"