oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'update-translations'

This commit is contained in:
Michael Kirk 2018-07-19 09:45:47 -06:00
parent a9353ed4e8 4ab6892e27
commit e05877a019
4 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Signal/src/ViewControllers/InviteFlow.swift
View File

@ -71,7 +71,7 @@ class InviteFlow: NSObject, MFMessageComposeViewControllerDelegate, MFMailCompos
return nil
}
let tweetString = NSLocalizedString("SETTINGS_INVITE_TWITTER_TEXT", comment: "content of tweet when inviting via twitter")
let tweetString = NSLocalizedString("SETTINGS_INVITE_TWITTER_TEXT", comment: "content of tweet when inviting via twitter - please do not translate URL")
twitterViewController.setInitialText(tweetString)
let tweetUrl = URL(string: installUrl)

17
Signal/translations/bin/auto-genstrings
View File

@ -27,12 +27,6 @@ fi
done
JSQ_STRINGS_PATH="../JSQMessagesViewController/JSQMessagesViewController/Assets/JSQMessagesAssets.bundle/Base.lproj/JSQMessages.strings"
if [ ! -f $JSQ_STRINGS_PATH ]; then
echo "[!] Error. Expected to find strings for JSQMessagesViewController at ${JSQ_STRINGS_PATH}"
exit 1
fi
# Now that we've check all our pre-conditions, proceed with the work.
# Search directories for .m & .h files and collect string definitions with genstrings
@ -58,14 +52,3 @@ echo "$OLDUTF8" | grep -Eo '^".*"' | \
if($2 ~ /"$/){$2 = $2";"}; \
print}' - <(echo "$NEWUTF8") > $STRINGFILE
# Copy in strings from JSQMessagesViewController
#
# We have a wider array of translators than JSQ, and it's easier for our
# translators to translate for us directly rather than to direct them to the
# now defunct JSQMessagesView project.
echo "Copying strings from JSQMessagesViewController"
echo "
// Strings Copied in from JSQMessagesViewController" >> $STRINGFILE
cat $JSQ_STRINGS_PATH | grep -v "^//" >> $STRINGFILE

33
Signal/translations/en.lproj/Localizable.strings
View File

@ -162,7 +162,7 @@
"ATTACHMENT_PICKER_DOCUMENTS_FAILED_ALERT_TITLE" = "Failed to choose document.";
/* Alert body when picking a document fails because user picked a directory/bundle */
"ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_BODY" = "Signal can't handle that file as is. Try zipping it before sending.";
"ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_BODY" = "Signal can't handle that file as is. Try compressing it before sending.";
/* Alert title when picking a document fails because user picked a directory/bundle */
"ATTACHMENT_PICKER_DOCUMENTS_PICKED_DIRECTORY_FAILED_ALERT_TITLE" = "Unsupported File";
@ -444,7 +444,7 @@
"CONTACT_FIELD_ADDRESS_POBOX" = "P.O. Box";
/* Label for the 'postcode' field of a contact's address. */
"CONTACT_FIELD_ADDRESS_POSTCODE" = "Post Code";
"CONTACT_FIELD_ADDRESS_POSTCODE" = "Postal Code";
/* Label for the 'region' field of a contact's address. */
"CONTACT_FIELD_ADDRESS_REGION" = "Region";
@ -811,7 +811,7 @@
"ENABLE_2FA_VIEW_TITLE" = "Registration Lock";
/* Call setup status label */
"END_CALL_RESPONDER_IS_BUSY" = "Busy.";
"END_CALL_RESPONDER_IS_BUSY" = "Busy";
/* Call setup status label */
"END_CALL_UNCATEGORIZED_FAILURE" = "Call Failed.";
@ -1322,11 +1322,11 @@
/* notification title. Embeds {{caller's name or phone number}} */
"MSGVIEW_MISSED_CALL_WITH_NAME" = "Missed call from %@.";
/* No comment provided by engineer. */
"MULTIDEVICE_PAIRING_MAX_DESC" = "You can not pair any more devices.";
/* alert title: cannot link - reached max linked devices */
"MULTIDEVICE_PAIRING_MAX_DESC" = "You cannot link any more devices.";
/* No comment provided by engineer. */
"MULTIDEVICE_PAIRING_MAX_RECOVERY" = "You have reached the maximum of devices you can currently pair with your account. Please remove a device or try again to pair it later.";
/* alert body: cannot link - reached max linked devices */
"MULTIDEVICE_PAIRING_MAX_RECOVERY" = "You have reached the maximum of devices you can currently link with your account. Please remove a device or try again to link it later.";
/* An explanation of the consequences of muting a thread. */
"MUTE_BEHAVIOR_EXPLANATION" = "You will not receive notifications for muted conversations.";
@ -1985,7 +1985,7 @@
/* Settings table view cell label */
"SETTINGS_INVITE_TITLE" = "Invite Your Friends";
/* content of tweet when inviting via twitter */
/* content of tweet when inviting via twitter - please do not translate URL */
"SETTINGS_INVITE_TWITTER_TEXT" = "You can reach me using @signalapp. Get it now: https://signal.org/download/";
/* Label for settings view that allows user to change the notification sound. */
@ -2347,20 +2347,3 @@
/* Info message embedding a {{time amount}}, see the *_TIME_AMOUNT strings for context. */
"YOU_UPDATED_DISAPPEARING_MESSAGES_CONFIGURATION" = "You set disappearing message time to %@.";
// Strings Copied in from JSQMessagesViewController
"load_earlier_messages" = "Load Earlier Messages";
"send" = "Send";
"new_message" = "New Message";
"text_message_accessibility_label" = "%@: %@";
"media_message_accessibility_label" = "%@: media message";
"accessory_button_accessibility_label" = "Share media";
"new_message_received_accessibility_announcement" = "New message received";

4
SignalServiceKit/src/Network/API/TSNetworkManager.m
View File

@ -205,9 +205,9 @@ typedef void (^failureBlock)(NSURLSessionDataTask *task, NSError *error);
DDLogInfo(@"Multi-device pairing: %ld, %@, %@", (long)statusCode, networkError.debugDescription, request);
failureBlock(task,
[self errorWithHTTPCode:statusCode
description:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_DESC", nil)
description:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_DESC", @"alert title: cannot link - reached max linked devices")
failureReason:networkError.localizedFailureReason
recoverySuggestion:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_RECOVERY", nil)
recoverySuggestion:NSLocalizedString(@"MULTIDEVICE_PAIRING_MAX_RECOVERY", @"alert body: cannot link - reached max linked devices")
fallbackError:networkError]);
break;
}