From b32080ec4e7cc7e73a74de818af8ea14239ba9aa Mon Sep 17 00:00:00 2001
From: Christoph Krey <krey.christoph@gmail.com>
Date: Thu, 17 Mar 2016 14:09:03 +0100
Subject: [PATCH] OwnTracks 9.1.1 >Release date: 2015-03-17

* [NEW] Localization support
* [FIX] Font issue on Friends geo-locator closes #391
* [FIX] Transition event without desc displays (null) closes #390
---
 .gitattributes                                |   2 ++
 CHANGELOG.md                                  |   6 ++--
 .../OwnTracks/Base.lproj/Localizable.strings  | Bin 14752 -> 14996 bytes
 .../Base.lproj/Storyboard.storyboard          |  33 +++++++++++-------
 OwnTracks/OwnTracks/OwnTracking.m             |  13 +++++--
 OwnTracks/OwnTracks/WaypointTVC.m             |   2 +-
 .../OwnTracks/de.lproj/Localizable.strings    | Bin 14760 -> 15008 bytes
 .../OwnTracks/en.lproj/Localizable.strings    | Bin 14752 -> 14996 bytes
 8 files changed, 38 insertions(+), 18 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..7012070c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.strings diff=localizablestrings
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 058a1109..c4a733be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,12 @@
-OnTracks iOS App Release Notes
+OwnTracks iOS App Release Notes
 ===================================
 
 ## OwnTracks 9.1.1
->Release date: 2015-03-05
+>Release date: 2015-03-17
 
 * [NEW] Localization support 
+* [FIX] Font issue on Friends geo-locator closes #391
+* [FIX] Transition event without desc displays (null) closes #390
 
 ## OwnTracks 9.1.0
 >Release date: 2015-03-03
diff --git a/OwnTracks/OwnTracks/Base.lproj/Localizable.strings b/OwnTracks/OwnTracks/Base.lproj/Localizable.strings
index 918fb78711b53ff05e5968884c3419554971b6ca..590e58e9fd3297648eb2eaa2d16198f7f99ff514 100644
GIT binary patch
delta 177
zcmZ2bJf(C(7H=LyB10}iDuV(;K115%k7knm`3yxsUIs%ZLkbY4PA-%XR@Y+CXW(K`
z0;*L2%BC`;17-6W@_-@=47NZFm6`leOLFo9X^xFWGCI=1Ky@WRm<d#u&QJ_gRm_kK
c)}1<ey|Sb_x;(-x6q(8LjKP~P=v?3d0Qht#y8r+H

delta 23
fcmbPIx}bPM*5nUb92<Yh=uA%F^Vxh(_ZSZVh9(M(

diff --git a/OwnTracks/OwnTracks/Base.lproj/Storyboard.storyboard b/OwnTracks/OwnTracks/Base.lproj/Storyboard.storyboard
index cde65c7c..7ce7a32d 100644
--- a/OwnTracks/OwnTracks/Base.lproj/Storyboard.storyboard
+++ b/OwnTracks/OwnTracks/Base.lproj/Storyboard.storyboard
@@ -596,10 +596,12 @@
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
-                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="clip" numberOfLines="4" baselineAdjustment="alignBaselines" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="apt-Il-Ih4">
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="clip" numberOfLines="5" baselineAdjustment="alignBaselines" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="apt-Il-Ih4">
                                             <rect key="frame" x="60" y="29" width="185" height="50"/>
                                             <string key="text">Street
Town
-Country</string>
+Country
+def
+xyz</string>
                                             <fontDescription key="fontDescription" name="HelveticaNeue-Light" family="Helvetica Neue" pointSize="13"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
@@ -808,18 +810,25 @@ Country</string>
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="87"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="place abc defasf 234, 1234 abcdde asdfa lk, asfda 33 aa" translatesAutoresizingMaskIntoConstraints="NO" id="VjN-rg-5pV">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="5" baselineAdjustment="alignBaselines" minimumFontSize="4" enabled="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1PK-JM-nD2">
                                                     <rect key="frame" x="20" y="8" width="280" height="71"/>
-                                                    <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                                                    <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
-                                                    <textInputTraits key="textInputTraits"/>
-                                                </textView>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="71" id="5DD-4b-V12"/>
+                                                    </constraints>
+                                                    <string key="text">Street
+1
+2
+3
+4</string>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="VjN-rg-5pV" firstAttribute="leading" secondItem="8dc-N3-61v" secondAttribute="leading" constant="20" symbolic="YES" id="J1r-qZ-MT3"/>
-                                                <constraint firstAttribute="trailing" secondItem="VjN-rg-5pV" secondAttribute="trailing" constant="20" symbolic="YES" id="Y9g-ga-cjL"/>
-                                                <constraint firstAttribute="bottom" secondItem="VjN-rg-5pV" secondAttribute="bottom" constant="8" id="gF7-uh-ucI"/>
-                                                <constraint firstItem="VjN-rg-5pV" firstAttribute="top" secondItem="8dc-N3-61v" secondAttribute="top" constant="8" id="vHr-Ip-bTj"/>
+                                                <constraint firstItem="1PK-JM-nD2" firstAttribute="leading" secondItem="8dc-N3-61v" secondAttribute="leading" constant="20" symbolic="YES" id="SOh-Xi-TuQ"/>
+                                                <constraint firstItem="1PK-JM-nD2" firstAttribute="centerY" secondItem="8dc-N3-61v" secondAttribute="centerY" id="gyV-jf-ane"/>
+                                                <constraint firstAttribute="trailing" secondItem="1PK-JM-nD2" secondAttribute="trailing" constant="20" symbolic="YES" id="reH-Z0-dc5"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -966,7 +975,7 @@ Country</string>
                     <connections>
                         <outlet property="UIcoordinate" destination="jwK-F1-3iE" id="Tnh-hA-xx9"/>
                         <outlet property="UIinfo" destination="Ikm-SR-MCD" id="RK4-H5-UBA"/>
-                        <outlet property="UIplace" destination="VjN-rg-5pV" id="H7Z-M1-yyx"/>
+                        <outlet property="UIplace" destination="1PK-JM-nD2" id="nt4-r6-yA8"/>
                         <outlet property="UItimestamp" destination="HVH-Pt-DXp" id="CTa-w1-7qb"/>
                         <outlet property="UItopic" destination="wKK-9Q-BMU" id="XP9-gS-sUT"/>
                     </connections>
diff --git a/OwnTracks/OwnTracks/OwnTracking.m b/OwnTracks/OwnTracks/OwnTracking.m
index 8289821b..72b6cc60 100644
--- a/OwnTracks/OwnTracks/OwnTracking.m
+++ b/OwnTracks/OwnTracks/OwnTracking.m
@@ -122,10 +122,17 @@ - (BOOL)processMessage:(NSString *)topic
                         } else if ([dictionary[@"_type"] isEqualToString:@"transition"]) {
                             NSString *type = dictionary[@"t"];
                             if (!type || ![type isEqualToString:@"b"]) {
+                                NSString *tid = dictionary[@"tid"];
+                                NSString *event = dictionary[@"event"];
+                                NSString *desc = dictionary[@"desc"];
+                                if (!desc) {
+                                    desc = NSLocalizedString(@"a region",
+                                                             @"name of an unknown or hidden region");
+                                }
                                 NSString *message = [NSString stringWithFormat:@"%@ %@s %@",
-                                                     dictionary[@"tid"],
-                                                     dictionary[@"event"],
-                                                     dictionary[@"desc"]];
+                                                     tid,
+                                                     event,
+                                                     desc];
                                 
                                 UILocalNotification *notification = [[UILocalNotification alloc] init];
                                 notification.alertBody = message;
diff --git a/OwnTracks/OwnTracks/WaypointTVC.m b/OwnTracks/OwnTracks/WaypointTVC.m
index 533405cb..cb67c53e 100644
--- a/OwnTracks/OwnTracks/WaypointTVC.m
+++ b/OwnTracks/OwnTracks/WaypointTVC.m
@@ -18,8 +18,8 @@
 
 @interface WaypointTVC ()
 @property (weak, nonatomic) IBOutlet UITextField *UIcoordinate;
+@property (weak, nonatomic) IBOutlet UILabel *UIplace;
 @property (weak, nonatomic) IBOutlet UITextField *UItimestamp;
-@property (weak, nonatomic) IBOutlet UITextView *UIplace;
 @property (weak, nonatomic) IBOutlet UITextField *UItopic;
 @property (weak, nonatomic) IBOutlet UITextField *UIinfo;
 
diff --git a/OwnTracks/OwnTracks/de.lproj/Localizable.strings b/OwnTracks/OwnTracks/de.lproj/Localizable.strings
index 51c652f49fb71e3d44a833fab9f563b76ba51c1a..022bda1c731763b6c37d3f4461b24a3e46ff3e9a 100644
GIT binary patch
delta 230
zcmZ2cyr6VKmT4YCB10}iDuV(;K0_LiOk~IdlBGa08;J86%EA16h9aP7216!83J|7F
zE|d^9)MC(Q;9^h$>QDg6rZS`hW%Gfmm4JL(AjXiHd{J6_W09P?pdV0AGSIXlpbijS
zvU#rhPZsH5pdlqdm<co_ouL?LL@`hrWOVA}^~#d!=<*1QP-G^{GX_sSAZN6hOLra*
E0PbfoYXATM

delta 42
ycmZ2bx}tbO*5m*~j*Y+M)OiCKLK&PGd>A|#f*CwEYij&tnVi7qv-y_pF&+RqmJT%l

diff --git a/OwnTracks/OwnTracks/en.lproj/Localizable.strings b/OwnTracks/OwnTracks/en.lproj/Localizable.strings
index 918fb78711b53ff05e5968884c3419554971b6ca..590e58e9fd3297648eb2eaa2d16198f7f99ff514 100644
GIT binary patch
delta 177
zcmZ2bJf(C(7H=LyB10}iDuV(;K115%k7knm`3yxsUIs%ZLkbY4PA-%XR@Y+CXW(K`
z0;*L2%BC`;17-6W@_-@=47NZFm6`leOLFo9X^xFWGCI=1Ky@WRm<d#u&QJ_gRm_kK
c)}1<ey|Sb_x;(-x6q(8LjKP~P=v?3d0Qht#y8r+H

delta 23
fcmbPIx}bPM*5nUb92<Yh=uA%F^Vxh(_ZSZVh9(M(