Skip to content

Commit

Permalink
OwnTracks 9.1.1
Browse files Browse the repository at this point in the history
>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
  • Loading branch information
Christoph Krey committed Mar 17, 2016
1 parent d0a84cc commit b32080e
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 18 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.strings diff=localizablestrings

6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file modified OwnTracks/OwnTracks/Base.lproj/Localizable.strings
Binary file not shown.
33 changes: 21 additions & 12 deletions OwnTracks/OwnTracks/Base.lproj/Storyboard.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
13 changes: 10 additions & 3 deletions OwnTracks/OwnTracks/OwnTracking.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion OwnTracks/OwnTracks/WaypointTVC.m
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Binary file modified OwnTracks/OwnTracks/de.lproj/Localizable.strings
Binary file not shown.
Binary file modified OwnTracks/OwnTracks/en.lproj/Localizable.strings
Binary file not shown.

0 comments on commit b32080e

Please sign in to comment.