From 433568ea3dcb3bc6b44d6358dd25c5976c9c7666 Mon Sep 17 00:00:00 2001
From: Danmei Chen <danmei.chen@belledonne-communications.com>
Date: Mon, 4 Mar 2019 14:28:49 +0100
Subject: [PATCH] fix title of devices list view

---
 Classes/DevicesListView.m              |   2 +-
 Classes/DevicesListView.xib            |  15 +++++++++++----
 Resources/fr.lproj/Localizable.strings | Bin 77986 -> 78142 bytes
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Classes/DevicesListView.m b/Classes/DevicesListView.m
index 0b4ca2aa8..615cb16e5 100644
--- a/Classes/DevicesListView.m
+++ b/Classes/DevicesListView.m
@@ -69,7 +69,7 @@ static UICompositeViewDescription *compositeDescription = nil;
         _addressLabel.text = [NSString stringWithUTF8String:linphone_chat_room_get_subject(_room) ?: LINPHONE_DUMMY_SUBJECT];
     }
     
-    _addressLabel.text = [NSString stringWithFormat:@"%@'s devices", _addressLabel.text];
+    _addressLabel.text = [NSString stringWithFormat:NSLocalizedString(@"%@'s devices", nil), _addressLabel.text];
     _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     [_tableView reloadData];
 }
diff --git a/Classes/DevicesListView.xib b/Classes/DevicesListView.xib
index 7c5736d12..99070c503 100644
--- a/Classes/DevicesListView.xib
+++ b/Classes/DevicesListView.xib
@@ -49,14 +49,21 @@
                                         <action selector="onBackClick:" destination="-1" eventType="touchUpInside" id="tJZ-ea-vFc"/>
                                     </connections>
                                 </button>
-                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="5" contentMode="left" fixedFrame="YES" text="Contact1" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="18k-7l-2Gm" userLabel="addressLabel">
-                                    <rect key="frame" x="75" y="0.0" width="142" height="66"/>
+                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" tag="5" contentMode="left" fixedFrame="YES" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="18k-7l-2Gm" userLabel="addressLabel">
+                                    <rect key="frame" x="75" y="0.0" width="300" height="66"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/>
                                     <accessibility key="accessibilityConfiguration" label="Contact name">
                                         <accessibilityTraits key="traits" none="YES"/>
                                     </accessibility>
-                                    <fontDescription key="fontDescription" type="system" pointSize="22"/>
-                                    <color key="textColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <attributedString key="attributedText">
+                                        <fragment content="Contact1">
+                                            <attributes>
+                                                <color key="NSColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <font key="NSFont" metaFont="system" size="23"/>
+                                                <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="truncatingTail" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+                                            </attributes>
+                                        </fragment>
+                                    </attributedString>
                                     <nil key="highlightedColor"/>
                                 </label>
                             </subviews>
diff --git a/Resources/fr.lproj/Localizable.strings b/Resources/fr.lproj/Localizable.strings
index da674e2d0488b7582c968cdf00597ad11804c71c..69a89d76e3db0caae4e53b697b7998aaf9831b76 100644
GIT binary patch
delta 84
zcmZ4VkY(Q^mJLeolP55<SgJD=Gbk{mFr+e+F=R3%1L<N0C7_5c5Gyg{fcfb1VE$yq
QgYlCKJasnvxre+20B@od2LJ#7

delta 18
acmdn@h-J}3mJLeolOOoYZNB54^b!D9r3pp=