Skip to content

Z
ZhiJi-Overseas
Commit efa65d43 authored by lmj_521aiau@163.com's avatar lmj_521aiau@163.com
Browse files
Options

srings

parent a04e52dd
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 20 deletions
ZhiJi.xcodeproj/project.pbxproj
View file @ efa65d43
......@@ -1746,7 +1746,7 @@
CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEVELOPMENT_TEAM = KQ4CS767WC;
GCC_NO_COMMON_BLOCKS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
......@@ -1839,7 +1839,7 @@
CODE_SIGN_ENTITLEMENTS = ZhiJi/ZhiJi.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 100;
CURRENT_PROJECT_VERSION = 101;
DEBUG_INFORMATION_FORMAT = dwarf;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = KQ4CS767WC;
......
ZhiJi/Classes/Care/Controller/ZJCareStyle2ViewController.m
View file @ efa65d43
......@@ -286,7 +286,7 @@
- (void)tipsBtnClick:(UIButton *)sender{
if (self.phoneTF.text.length == 0) {
[MBProgressHUD showMessage:@"请输入手机号"];
[MBProgressHUD showMessage:kLocalizedString(@"emergency_enter_phone")];
return;
}
......
ZhiJi/Classes/LocationVC/ZJLocationVC.xib
View file @ efa65d43
......@@ -30,7 +30,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fSh-sX-R0o">
<rect key="frame" x="0.0" y="0.0" width="414" height="36"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="为了您能更好地体验Family MappApp,请进行以下设置：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="57c-sW-NKG">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="为了您能更好地体验Family Mapp,请进行以下设置：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="57c-sW-NKG">
<rect key="frame" x="14.5" y="0.0" width="399.5" height="36"/>
<color key="backgroundColor" red="0.67183357480000006" green="0.73134952779999995" blue="0.8706133962" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
<constraints>
......
ZhiJi/Classes/Main/View/Protocol.m
View file @ efa65d43
......@@ -57,7 +57,7 @@
//neiRongLabel
NSString *str = @" Family MappAPP需要双方安装并加好友授权同意，APP付费方即可时刻关注对方的位置信息。\n 注册为Family Mapp会员或接受付费会员的好友邀请意味着 您将向平台和该付费会员提供地理位置，行为轨迹，高度等隐私信息。您正在使用的产品/服务及其功能将会收集、储存和使用您的相关信息，包括但不限于您的GPS定位、设备信息、手机通讯录等，您将受到《用户协议》和《隐私政策》的约束。您点击类似“同意并继续”按钮后或进行主动勾选同 义本协议等操作后，即表示您充分理解隐私政策内 容以及上述描述，并已同意授权平台按照隐私政策 内容合法收集、储存和使用您的个人信息。为保护 您的合法权益，请认真阅读并充分理解《隐私政策》内容。";
NSString *str = @" Family Mapp需要双方安装并加好友授权同意，APP付费方即可时刻关注对方的位置信息。\n 注册为Family Mapp会员或接受付费会员的好友邀请意味着 您将向平台和该付费会员提供地理位置，行为轨迹，高度等隐私信息。您正在使用的产品/服务及其功能将会收集、储存和使用您的相关信息，包括但不限于您的GPS定位、设备信息、手机通讯录等，您将受到《用户协议》和《隐私政策》的约束。您点击类似“同意并继续”按钮后或进行主动勾选同 义本协议等操作后，即表示您充分理解隐私政策内 容以及上述描述，并已同意授权平台按照隐私政策 内容合法收集、储存和使用您的个人信息。为保护 您的合法权益，请认真阅读并充分理解《隐私政策》内容。";
_neiRongLabel = [UILabel labelWithtext:str font:[UIFont systemFontOfSize:KFont(13)] textColor:[UIColor colorWithHex:0x333333] alignment:NSTextAlignmentLeft];
//设置行间距
......
ZhiJi/Classes/Mine/Controller/ZJSettingViewController.m
View file @ efa65d43
......@@ -103,17 +103,17 @@
- (NSArray *)dataSource {
if (!_dataSource) {
if (![ZJUserInfoManager shared].isLogin) {
_dataSource = @[@"版本检测",
kLocalizedString(@"setting_privacy"),
kLocalizedString(@"setting_service"),
kLocalizedString(@"setting_payment_service"),
_dataSource = @[kLocalizedString(@"setting_version"),
kLocalizedString(@"setting_privacy"),
kLocalizedString(@"setting_service"),
kLocalizedString(@"setting_payment_service"),
];
}else{
_dataSource = @[@"版本检测",
kLocalizedString(@"setting_privacy"),
kLocalizedString(@"setting_service"),
kLocalizedString(@"setting_payment_service"),
kLocalizedString(@"setting_delete_account")
_dataSource = @[kLocalizedString(@"setting_version"),
kLocalizedString(@"setting_privacy"),
kLocalizedString(@"setting_service"),
kLocalizedString(@"setting_payment_service"),
kLocalizedString(@"setting_delete_account")
];
}
}
......@@ -167,8 +167,8 @@
//判断两个版本是否相同
for (int count = 0; count < currentVersionArr.count; count++) {
if ([currentVersionArr[count] intValue] < [updateVersionArr[count] intValue]) {
NSString *titleStr = [NSString stringWithFormat:@"检查更新：%@", trackName];
NSString *messageStr = [NSString stringWithFormat:@"发现新版本(%@),是否升级", updateVersion];
NSString *titleStr = [NSString stringWithFormat:kLocalizedString(@"setting_version_checking"), trackName];
NSString *messageStr = [NSString stringWithFormat:kLocalizedString(@"setting_version_update"), updateVersion];
needUpdate = YES;
// [AlertControllerTool alertControllerWithTitle:titleStr message:messageStr cancelTitle:@"去更新" cancelBlock:^{
// [[UIApplication sharedApplication] openURL:[NSURL URLWithString:trackViewUrl]];
......
ZhiJi/en.lproj/Localizable.strings
View file @ efa65d43
......@@ -125,7 +125,7 @@ appName = "Family Mapp";
"location_check_tutorial"="View the tutorial";
"location_check_tutorial_cancel"="Cancel";
"location_alert_details_0"="为了您能更好地体验Family MappApp,请进行以下设置：";
"location_alert_details_0"="为了您能更好地体验Family Mapp,请进行以下设置：";
"location_alert_details_1"="确认对方没有删除Family Mapp";
"location_alert_details_2"="如果删除了请分享应用给Ta重新下载并安装、登录";
"location_alert_details_3"="位置权限设置";
......@@ -146,7 +146,6 @@ appName = "Family Mapp";
"mine_online_service"="Help";
"mine_unlocked"="unlocked";
"mine_valid_until"="Valid until";
"mine_renewal"="Renewal";
"mine_enter_nickname"="Enter a new username";
......@@ -154,12 +153,16 @@ appName = "Family Mapp";
//setting
"setting"="Settings";
"setting_version"="Version checking";
"setting_privacy"="Privacy Policy";
"setting_service"="Terms of Service";
"setting_payment_service"="Payment Terms of Service";
"setting_delete_account"="Delete Account";
"setting_sign_out"="Sign out";
"setting_version_checking"="Checking：%@";
"setting_version_update"="Find new version:%@, Update?";
//emergency contact
"emergency_none"="You haven't added any emergency contact";
"emergency_add"="Go to add";
......@@ -182,8 +185,11 @@ appName = "Family Mapp";
"定位Ta教程"="";
"为了您能更好地体验Family MappApp,请进行以下设置："="";
"为了您能更好地体验Family Mapp,请进行以下设置："="";
"确认对方没有删除Family Mapp"="";
"如果删除了请分享应用给Ta重新下载并安装、登录"="";
"位置权限设置"="";
"如果Ta关闭了位置权限，请让Ta前往设置>权限管理>Family Mapp里开启位置权限。"="";
"功能未解锁"="";
"添加位置关心"="";
ZhiJi/zh-Hans.lproj/Localizable.strings
View file @ efa65d43
......@@ -92,7 +92,7 @@ appName = "Family Mapp";
"location_check_tutorial"="查看教程";
"location_check_tutorial_cancel"="知道了";
"location_alert_details_0"="为了您能更好地体验Family MappApp,请进行以下设置：";
"location_alert_details_0"="为了您能更好地体验Family Mapp,请进行以下设置：";
"location_alert_details_1"="确认对方没有删除Family Mapp";
"location_alert_details_2"="如果删除了请分享应用给Ta重新下载并安装、登录";
"location_alert_details_3"="位置权限设置";
......@@ -120,12 +120,17 @@ appName = "Family Mapp";
//setting
"setting"="设置";
"setting_version"="版本检测";
"setting_privacy"="隐私政策";
"setting_service"="用户协议";
"setting_payment_service"="用户付费协议";
"setting_delete_account"="注销账户";
"setting_sign_out"="退出登录";
"setting_version_checking"="检查更新：%@";
"setting_version_update"="发现新版本(%@),是否升级";
//emergency contact
"emergency_none"="您还没有添加紧急联系人哦～";
"emergency_add"="去添加";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment