update texts

This commit is contained in:
Benjamin Reis 2018-05-24 10:38:24 +02:00
parent c9477d09ed
commit 245f285725
6 changed files with 16 additions and 16 deletions

View file

@ -129,7 +129,7 @@
<bool key="isElement" value="YES"/>
</accessibility>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<state key="normal" title="QUIT CHATROOM">
<state key="normal" title="LEAVE THE GROUP">
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</state>
<state key="highlighted" backgroundImage="color_F.png">
@ -139,7 +139,7 @@
<action selector="onQuitClick:" destination="-1" eventType="touchUpInside" id="TT0-hW-JMh"/>
</connections>
</button>
<textField opaque="NO" clipsSubviews="YES" tag="100" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Name this chatroom" textAlignment="center" adjustsFontSizeToFit="NO" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="69I-Un-ASz" userLabel="chatRoomNameField">
<textField opaque="NO" clipsSubviews="YES" tag="100" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Name the group" textAlignment="center" adjustsFontSizeToFit="NO" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="69I-Un-ASz" userLabel="chatRoomNameField">
<rect key="frame" x="9" y="74" width="396" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.85415387149999999" green="0.85412830110000004" blue="0.85414278509999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

View file

@ -333,7 +333,7 @@ static UICompositeViewDescription *compositeDescription = nil;
NSString *composingAddresses = @"";
if (bctbx_list_size(addresses) == 1) {
composingAddresses = [FastAddressBook displayNameForAddress:(LinphoneAddress *)addresses->data];
_composeLabel.text = [NSString stringWithFormat:NSLocalizedString(@"%@ is composing...", nil), composingAddresses];
_composeLabel.text = [NSString stringWithFormat:NSLocalizedString(@"%@ is writing...", nil), composingAddresses];
} else {
while (addresses) {
if (![composingAddresses isEqualToString:@""])
@ -341,7 +341,7 @@ static UICompositeViewDescription *compositeDescription = nil;
composingAddresses = [composingAddresses stringByAppendingString:[FastAddressBook displayNameForAddress:(LinphoneAddress *)addresses->data]];
addresses = addresses->next;
}
_composeLabel.text = [NSString stringWithFormat:NSLocalizedString(@"%@ are composing...", nil), composingAddresses];
_composeLabel.text = [NSString stringWithFormat:NSLocalizedString(@"%@ are writing...", nil), composingAddresses];
}
} else {
// pull down the composing frame and widen the tableview

View file

@ -224,8 +224,8 @@ void deletion_chat_room_state_changed(LinphoneChatRoom *cr, LinphoneChatRoomStat
if (editingStyle == UITableViewCellEditingStyleDelete) {
LinphoneChatRoom *chatRoom = (LinphoneChatRoom *)bctbx_list_nth_data(_data, (int)[indexPath row]);
NSString *msg = (LinphoneChatRoomCapabilitiesOneToOne & linphone_chat_room_get_capabilities(chatRoom))
? [NSString stringWithFormat:NSLocalizedString(@"Do you really want to delete this conversation?", nil)]
: [NSString stringWithFormat:NSLocalizedString(@"Do you really want to delete and leave this conversation?", nil)];
? [NSString stringWithFormat:NSLocalizedString(@"Do you want to delete this conversation?", nil)]
: [NSString stringWithFormat:NSLocalizedString(@"Do you want to leave and delete this conversation?", nil)];
[UIConfirmationDialog ShowWithMessage:msg
cancelMessage:nil
confirmMessage:nil

View file

@ -104,8 +104,8 @@ static UICompositeViewDescription *compositeDescription = nil;
}
}
NSString *msg = group
? [NSString stringWithFormat:NSLocalizedString(@"Do you really want to delete and leave the selected conversations?", nil)]
: [NSString stringWithFormat:NSLocalizedString(@"Do you really want to delete the selected conversations?", nil)];
? [NSString stringWithFormat:NSLocalizedString(@"Do you want to leave and delete the selected conversations?", nil)]
: [NSString stringWithFormat:NSLocalizedString(@"Do you want to delete the selected conversations?", nil)];
[UIConfirmationDialog ShowWithMessage:msg
cancelMessage:nil
confirmMessage:nil

View file

@ -224,7 +224,7 @@ static UICompositeViewDescription *compositeDescription = nil;
}
};
DTActionSheet *sheet = [[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select picture source", nil)];
DTActionSheet *sheet = [[DTActionSheet alloc] initWithTitle:NSLocalizedString(@"Select the source", nil)];
if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
[sheet addButtonWithTitle:NSLocalizedString(@"Camera", nil)
block:^() {

View file

@ -62,41 +62,41 @@ static const CGFloat NOTIFIED_CELL_HEIGHT = 44;
switch (linphone_event_log_get_type(event)) {
case LinphoneEventLogTypeConferenceSubjectChanged: {
NSString *subject = [NSString stringWithUTF8String:linphone_event_log_get_subject(event) ?: LINPHONE_DUMMY_SUBJECT];
NSString *formatedString = [NSString stringWithFormat:@"Chat room subject has changed to : %@", subject];
NSString *formatedString = [NSString stringWithFormat:@"New subject : %@", subject];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceParticipantAdded: {
NSString *participant = [FastAddressBook displayNameForAddress:linphone_event_log_get_participant_address(event)];
NSString *formatedString = [NSString stringWithFormat:@"%@ has been added to the chat room", participant];
NSString *formatedString = [NSString stringWithFormat:@"%@ has joined", participant];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceParticipantRemoved: {
NSString *participant = [FastAddressBook displayNameForAddress:linphone_event_log_get_participant_address(event)];
NSString *formatedString = [NSString stringWithFormat:@"%@ has been removed of the chat room", participant];
NSString *formatedString = [NSString stringWithFormat:@"%@ has left", participant];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceParticipantSetAdmin: {
NSString *participant = [FastAddressBook displayNameForAddress:linphone_event_log_get_participant_address(event)];
NSString *formatedString = [NSString stringWithFormat:@"%@ is now an admin of the chat room", participant];
NSString *formatedString = [NSString stringWithFormat:@"%@ is now an admin", participant];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceParticipantUnsetAdmin: {
NSString *participant = [FastAddressBook displayNameForAddress:linphone_event_log_get_participant_address(event)];
NSString *formatedString = [NSString stringWithFormat:@"%@ is no longer an admin of the chat room", participant];
NSString *formatedString = [NSString stringWithFormat:@"%@ is no longer an admin", participant];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceTerminated: {
NSString *formatedString = [NSString stringWithFormat:@"Chat room has been left"];
NSString *formatedString = [NSString stringWithFormat:@"You have left the group"];
eventString = NSLocalizedString(formatedString, nil);
break;
}
case LinphoneEventLogTypeConferenceCreated: {
NSString *formatedString = [NSString stringWithFormat:@"Chat room has been entered"];
NSString *formatedString = [NSString stringWithFormat:@"You have joined the group"];
eventString = NSLocalizedString(formatedString, nil);
break;
}