Skip to content

Commit

Permalink
Merge pull request #184 from apptentive/2.0.4
Browse files Browse the repository at this point in the history
2.0.4: Info.plist fixes, localization fixes, YYYY fix.
  • Loading branch information
frankus committed Oct 27, 2015
2 parents 5ceb950 + 0f209a1 commit 8ff45b6
Show file tree
Hide file tree
Showing 13 changed files with 233 additions and 62 deletions.
77 changes: 41 additions & 36 deletions ApptentiveConnect/ApptentiveConnect.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

150 changes: 150 additions & 0 deletions ApptentiveConnect/Resources/localization/pt.lproj/Localizable.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
/* (No Commment) */
"About Apptentive" = "Sobre o Apptentive";

/* (No Commment) */
"Answer" = "Resposta";

/* (No Commment) */
"Apptentive is a service that allows you to have a conversation with the makers of this app. Your input and feedback can help to provide you with a better overall experience.

Your feedback is hosted by Apptentive and is subject to both Apptentive’s privacy policy and the privacy policy of this app’s developer." = "Apptentive é um serviço que permite que você tenha uma conversa com quem criou esse aplicativo. Seu feedback e seus comentários podem ajudar a oferecer uma experiência geral melhor.

Seu feedback fica hospedado na Apptentive e está sujeito às políticas de privacidade da Apptentive e do desenvolvedor do aplicativo.";

/* (No Commment) */
"Apptentive’s Privacy Policy" = "Política de privacidade da Apptentive";

/* (No Commment) */
"Authentication Failed" = "Falha de autenticação";

/* (No Commment) */
"Close" = "Fechar";

/* (No Commment) */
"Closes Message Center." = "Fecha a Central de mensagens.";

/* (No Commment) */
"Discard" = "Descartar";

/* (No Commment) */
"Discards the message." = "Descarta a mensagem.";

/* (No Commment) */
"Displays information about this feature." = "Exibe informações sobre este recurso.";

/* (No Commment) */
"Displays name and email editor." = "Exibe editor de nome e e-mail.";

/* (No Commment) */
"Do you love %@?" = "Você adorou %@?";

/* (No Commment) */
"Failed" = "Falha";

/* (No Commment) */
"Invalid response from server." = "Resposta inválida do servidor.";

/* (No Commment) */
"Learn about Apptentive" = "Aprenda sobre o Apptentive";

/* (No Commment) */
"Missing %d required answers." = "Faltam %d respostas obrigatórias.";

/* (No Commment) */
"Missing a required answer." = "Falta uma resposta obrigatória.";

/* (No Commment) */
"Network Connection Error" = "Erro de conexão de rede";

/* (No Commment) */
"No" = "Não";

/* (No Commment) */
"No Thanks" = "Não, obrigado";

/* (No Commment) */
"OK" = "OK";

/* (No Commment) */
"Oops!" = "Opa!";

/* (No Commment) */
"Powered by" = "Usa";

/* (No Commment) */
"Profile" = "Perfil";

/* (No Commment) */
"Rate %@" = "Classificar %@";

/* (No Commment) */
"Remind Me Later" = "Lembre-me depois";

/* (No Commment) */
"Send Response" = "Enviar resposta";

/* (No Commment) */
"Sending…" = "Enviando…";

/* (No Commment) */
"Sends the message." = "Envia a mensagem.";

/* (No Commment) */
"Sent" = "Enviada";

/* (No Commment) */
"Server did not return properly formatted JSON." = "O servidor não retornou um JSON formatado adequadamente.";

/* (No Commment) */
"Server error." = "Erro de servidor.";

/* (No Commment) */
"Survey" = "Pesquisa";

/* (No Commment) */
"Thank You" = "Obrigado";

/* (No Commment) */
"Thanks!" = "Obrigado!";

/* (No Commment) */
"The request was well-formed but was unable to be followed due to semantic errors." = "O pedido estava bem formado, mas não pôde ser seguido devido a erros de semântica.";

/* (No Commment) */
"Too few selections made for %d questions above." = "Muito poucas escolhas feitas para as %d perguntas acima.";

/* (No Commment) */
"Too few selections made for a question above." = "Muito poucas escolhas feitas para uma pergunta acima.";

/* (No Commment) */
"Too many selections made for %d questions above." = "Foram feitas escolhas demais para as %d perguntas acima.";

/* (No Commment) */
"Too many selections made for a question above." = "Foram feitas escolhas demais para uma pergunta acima.";

/* (No Commment) */
"Unable to load the App Store" = "Impossível carregar a App Store";

/* (No Commment) */
"Unprocessable Entity" = "Entidade não processável";

/* (No Commment) */
"We're so happy to hear that you love %@! It'd be really helpful if you rated us. Thanks so much for spending some time with us." = "Estamos muito felizes de saber que você adora %@! Seria muito útil se você nos classificasse. Obrigado por dedicar um tempinho para nós.";

/* (No Commment) */
"We’re attempting to connect. Thanks for your patience!" = "Estamos tentando conectar. Obrigado pela sua paciência!";

/* (No Commment) */
"Wrong username and/or password." = "Nome de usuário e/ou senha errados.";

/* (No Commment) */
"Yes" = "Sim";

/* (No Commment) */
"You must connect to the internet before you can send feedback." = "Você precisa se conectar à internet antes de poder enviar feedback.";

/* (No Commment) */
"required" = "obrigatório";

/* (No Comment) */
"Message Center" = "Central de mensagens";
6 changes: 6 additions & 0 deletions ApptentiveConnect/resources/ApptentiveResources/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,11 @@
<string></string>
<key>ATInfoDistributionKey</key>
<string>source</string>
<key>CFBundleIdentifier</key>
<string>com.apptentive.resources-ios</string>
<key>CFBundleVersion</key>
<string>2.0</string>
<key>CFBundleShortVersionString</key>
<string>2.0</string>
</dict>
</plist>
6 changes: 5 additions & 1 deletion ApptentiveConnect/source/ATConnect.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#import <Cocoa/Cocoa.h>
#endif

#define kATConnectVersionString @"2.0.3"
#define kATConnectVersionString @"2.0.4"

#if TARGET_OS_IPHONE
# define kATConnectPlatformString @"iOS"
Expand Down Expand Up @@ -44,9 +44,13 @@ extern NSString *const ATSurveyIDKey;

/** Supported Push Providers for use in `setPushNotificationIntegration:withDeviceToken:` */
typedef NS_ENUM(NSInteger, ATPushProvider){
/** Specifies the Apptentive push provider. */
ATPushProviderApptentive,
/** Specifies the Urban Airship push provider. */
ATPushProviderUrbanAirship,
/** Specifies the Amazon Simple Notification Service push provider. */
ATPushProviderAmazonSNS,
/** Specifies the Parse push provider. */
ATPushProviderParse,
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8173.3" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment version="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8142"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
<capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
</dependencies>
<objects>
Expand All @@ -29,10 +29,12 @@
<subviews>
<webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5AC-Tj-OQC" userLabel="WebView">
<rect key="frame" x="44" y="124" width="232" height="367"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</webView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9kO-hO-1kr">
<rect key="frame" x="0.0" y="491" width="320" height="44"/>
<animations/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="rEP-53-KEu"/>
Expand All @@ -55,18 +57,21 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xb1-0d-gEd" userLabel="poweredByBackground">
<rect key="frame" x="0.0" y="535" width="320" height="33"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="at_update_logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="0ci-Np-jvr" userLabel="poweredByImage">
<imageView userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="at_update_logo.png" translatesAutoresizingMaskIntoConstraints="NO" id="0ci-Np-jvr" userLabel="poweredByImage">
<rect key="frame" x="162" y="10" width="85" height="16"/>
<animations/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</imageView>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="Powered by" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="U9Q-HH-Gvj">
<rect key="frame" x="83" y="8" width="75.5" height="17"/>
<animations/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.60784313729999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
<size key="shadowOffset" width="0.0" height="1"/>
</label>
</subviews>
<animations/>
<color key="backgroundColor" red="0.94117647059999998" green="0.93725490199999995" blue="0.96078431369999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<gestureRecognizers/>
<constraints>
Expand All @@ -84,19 +89,22 @@
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rQz-Tc-GZb">
<rect key="frame" x="0.0" y="0.0" width="320" height="124"/>
<animations/>
<color key="backgroundColor" red="0.98039215686274506" green="0.98039215686274506" blue="0.98039215686274506" alpha="0.48999999999999999" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="124" id="hqC-f9-ncj"/>
</constraints>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="cdb-y8-Jty" userLabel="AppIcon">
<rect key="frame" x="120" y="84" width="80" height="80"/>
<animations/>
<constraints>
<constraint firstAttribute="width" constant="80" id="F6u-1d-lcA"/>
<constraint firstAttribute="width" secondItem="cdb-y8-Jty" secondAttribute="height" multiplier="1:1" id="ksH-hG-fT5"/>
</constraints>
</imageView>
</subviews>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="9kO-hO-1kr" firstAttribute="top" secondItem="5AC-Tj-OQC" secondAttribute="bottom" id="2lQ-IK-Het"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ - (void)viewDidLoad {
[ATBackend sharedBackend].messageDelegate = self;

self.dateFormatter = [[NSDateFormatter alloc] init];
self.dateFormatter.dateFormat = [NSDateFormatter dateFormatFromTemplate:@"MMMMdYYYY" options:0 locale:[NSLocale currentLocale]];
self.dateFormatter.dateFormat = [NSDateFormatter dateFormatFromTemplate:@"MMMMdyyyy" options:0 locale:[NSLocale currentLocale]];
self.dataSource.dateFormatter.dateFormat = self.dateFormatter.dateFormat; // Used to determine if date changed between messages

self.greetingView.orientation = self.interfaceOrientation;
Expand Down
2 changes: 1 addition & 1 deletion ApptentiveConnect/source/URL Loading/ATAPIRequest.m
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ - (void)connectionFinishedSuccessfully:(ATURLConnection *)sender {
ATLogError(@"Connection failed. %@, %@", self.errorTitle, self.errorMessage);
ATLogInfo(@"Status was: %d", sender.statusCode);
if (sender.statusCode == 401) {
ATLogDebug(@"Your Apptentive API key may not be set correctly!");
ATLogError(@"Your Apptentive API key may not be set correctly!");
}
if (sender.statusCode == 422) {
if ([[connection.targetURL absoluteString] isEqualToString:[[ATWebClient sharedClient] apiURLStringWithPath:@"events"]]) {
Expand Down
2 changes: 2 additions & 0 deletions ApptentiveConnect/tests/zh-Hant.lproj/InfoPlist.strings
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/* Localized versions of Info.plist keys */

7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2015-10-26 frankus v2.0.4
--------------------------------

Version 2.0.4 is a small bugfix update, including missing keys in ApptentiveResource.bundle's Info.plist file and localization fixes for Chinese and Portuguese.

2015-10-14 pkamb, frankus v2.0.3
--------------------------------

Expand All @@ -10,7 +15,7 @@ Version 2.0.2 fixes several bugs a bug where the bar tint color of Message Cente

This version fixes a bug that was not allowing in-app notification banners to be enabled for new messages in Message Center.

The Message Center UI also contains a number of small usability improvements.
The Message Center UI also contains a number of small usability improvements.

2015-09-08 pkamb, frankus v2.0.1
--------------------------------
Expand Down
25 changes: 8 additions & 17 deletions FeedbackDemo/FeedbackDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
019CEBEC1BDEDE9400CCEC97 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
019CEBED1BDEDE9400CCEC97 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "pt-BR"; path = "pt-BR.lproj/Main.storyboard"; sourceTree = "<group>"; };
019CEBEE1BDEDE9400CCEC97 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
019CEBEF1BDEDE9400CCEC97 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
01A16C8C1AF2A66B00D691FC /* FeedbackDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FeedbackDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
01A16C901AF2A66B00D691FC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
01A16C911AF2A66B00D691FC /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -178,14 +182,6 @@
5856C4DD1B8E640A00818594 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "zh-Hant"; path = "zh-Hant.lproj/Main.storyboard"; sourceTree = "<group>"; };
5856C4DE1B8E640A00818594 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
5856C4E01B8E640E00818594 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
5856C4E11B8E64C900818594 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
5856C4E21B8E64C900818594 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "pt-BR"; path = "pt-BR.lproj/Main.storyboard"; sourceTree = "<group>"; };
5856C4E31B8E64C900818594 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
5856C4E41B8E64C900818594 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
5856C4E51B8E653800818594 /* es-ES */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-ES"; path = "es-ES.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
5856C4E61B8E653800818594 /* es-ES */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = "es-ES"; path = "es-ES.lproj/Main.storyboard"; sourceTree = "<group>"; };
5856C4E71B8E653800818594 /* es-ES */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-ES"; path = "es-ES.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
5856C4E81B8E653800818594 /* es-ES */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-ES"; path = "es-ES.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
58DD74F91B8FA64C00F2804A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
58DD74FE1B8FA6C500F2804A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -403,7 +399,6 @@
"zh-Hans",
"zh-Hant",
"pt-BR",
"es-ES",
);
mainGroup = 01A16C831AF2A66B00D691FC;
productRefGroup = 01A16C8D1AF2A66B00D691FC /* Products */;
Expand Down Expand Up @@ -532,8 +527,7 @@
5856C49F1B8E5EF200818594 /* tr */,
5856C4A11B8E5EF900818594 /* zh-Hans */,
5856C4DD1B8E640A00818594 /* zh-Hant */,
5856C4E21B8E64C900818594 /* pt-BR */,
5856C4E61B8E653800818594 /* es-ES */,
019CEBED1BDEDE9400CCEC97 /* pt-BR */,
);
name = Main.storyboard;
sourceTree = "<group>";
Expand All @@ -560,9 +554,8 @@
5856C49E1B8E5EF200818594 /* tr */,
5856C4A01B8E5EF900818594 /* zh-Hans */,
5856C4DC1B8E640A00818594 /* zh-Hant */,
5856C4E11B8E64C900818594 /* pt-BR */,
5856C4E51B8E653800818594 /* es-ES */,
58DD74F91B8FA64C00F2804A /* en */,
019CEBEC1BDEDE9400CCEC97 /* pt-BR */,
);
name = LaunchScreen.xib;
sourceTree = "<group>";
Expand All @@ -588,8 +581,7 @@
5856C4D81B8E63B800818594 /* tr */,
5856C4DA1B8E63D200818594 /* zh-Hans */,
5856C4DE1B8E640A00818594 /* zh-Hant */,
5856C4E31B8E64C900818594 /* pt-BR */,
5856C4E71B8E653800818594 /* es-ES */,
019CEBEE1BDEDE9400CCEC97 /* pt-BR */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
Expand All @@ -615,9 +607,8 @@
5856C4D91B8E63B800818594 /* tr */,
5856C4DB1B8E63D200818594 /* zh-Hans */,
5856C4E01B8E640E00818594 /* zh-Hant */,
5856C4E41B8E64C900818594 /* pt-BR */,
5856C4E81B8E653800818594 /* es-ES */,
58DD74FE1B8FA6C500F2804A /* en */,
019CEBEF1BDEDE9400CCEC97 /* pt-BR */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
Expand Down
2 changes: 1 addition & 1 deletion FeedbackDemo/FeedbackDemo/pt-BR.lproj/LaunchScreen.strings
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

/* Class = "UILabel"; text = "Apptentive"; ObjectID = "kId-c2-rCX"; */
"kId-c2-rCX.text" = "Apptentive";

2 changes: 1 addition & 1 deletion apptentive-ios.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'apptentive-ios'
s.version = '2.0.3'
s.version = '2.0.4'
s.license = 'BSD'
s.summary = 'Apptentive Customer Communications SDK.'
s.homepage = 'https://www.apptentive.com/'
Expand Down

0 comments on commit 8ff45b6

Please sign in to comment.