From 21f1abc6e954b4ccc10c80b43815c6442894d64e Mon Sep 17 00:00:00 2001
From: Gk40002148 <yamaguchi.yuudai@nttdata-sbc.co.jp>
Date: Mon, 11 Apr 2022 14:43:44 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E6=83=85=E5=A0=B1=E5=8F=96=E5=BE=97API=20=E3=83=AC?=
 =?UTF-8?q?=E3=82=B9=E3=83=9D=E3=83=B3=E3=82=B9=E9=A0=85=E7=9B=AE=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AgileWorks/Common/Entity/SessionInfo.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AgileWorks/Common/Entity/SessionInfo.swift b/AgileWorks/Common/Entity/SessionInfo.swift
index e893984..695a4e8 100644
--- a/AgileWorks/Common/Entity/SessionInfo.swift
+++ b/AgileWorks/Common/Entity/SessionInfo.swift
@@ -12,6 +12,7 @@ struct User: Codable {
     let code: String
     let name: String
     let loginId: String?
+    let displayLanguage: String
 }
 
 struct Unit: Codable {
-- 
GitLab


From a5d12eb16ac23cdc2255e5a37a3dd6989f62bf55 Mon Sep 17 00:00:00 2001
From: Gk40002148 <yamaguchi.yuudai@nttdata-sbc.co.jp>
Date: Mon, 11 Apr 2022 16:21:06 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3?=
 =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=82=88=E3=82=8A=E8=A8=80=E8=AA=9E=E9=81=B8?=
 =?UTF-8?q?=E6=8A=9E=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Login/Presenter/LoginPresenter.swift      |   2 +-
 .../Login/View/LoginViewController.storyboard | 116 ++++----------
 .../Login/View/LoginViewController.swift      | 144 ++++--------------
 .../Common/Utility/StringsUtility.swift       |  16 --
 4 files changed, 60 insertions(+), 218 deletions(-)

diff --git a/AgileWorks/AgileWorks/Login/Presenter/LoginPresenter.swift b/AgileWorks/AgileWorks/Login/Presenter/LoginPresenter.swift
index 65f1984..4b67173 100644
--- a/AgileWorks/AgileWorks/Login/Presenter/LoginPresenter.swift
+++ b/AgileWorks/AgileWorks/Login/Presenter/LoginPresenter.swift
@@ -36,7 +36,7 @@ extension LoginPresenterImpl: LoginPresenter {
         let oauth = OAuthService()
         oauth.viewController = view
 
-        oauth.fetch() { result in
+        oauth.fetch { result in
             switch result {
             case .success:
                 // 前回ログアウト時にオフラインだった等の理由で以前ログインしていた時に
diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard b/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
index 0fa79b3..ae4f5c3 100644
--- a/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
+++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Muw-p4-tJJ">
-    <device id="retina5_9" orientation="portrait" appearance="light"/>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Muw-p4-tJJ">
+    <device id="retina6_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -15,74 +15,24 @@
             <objects>
                 <viewController storyboardIdentifier="LoginViewController" id="Muw-p4-tJJ" customClass="LoginViewController" customModule="AgileWorks" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="y0G-OM-QoL">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" bouncesZoom="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yLq-r2-C5q">
-                                <rect key="frame" x="0.0" y="44" width="375" height="734"/>
+                                <rect key="frame" x="0.0" y="44" width="428" height="848"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hb3-Nf-olK" userLabel="Login Contents">
-                                        <rect key="frame" x="0.0" y="100.00000000000003" width="375" height="314.66666666666674"/>
+                                        <rect key="frame" x="0.0" y="80" width="428" height="344"/>
                                         <subviews>
-                                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nDV-E0-5BI" userLabel="Language Stack View">
-                                                <rect key="frame" x="158" y="4" width="170" height="33"/>
-                                                <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Language" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QxD-Of-5dx">
-                                                        <rect key="frame" x="0.0" y="0.0" width="80" height="33"/>
-                                                        <constraints>
-                                                            <constraint firstAttribute="width" constant="80" id="pFJ-Sp-AtA"/>
-                                                        </constraints>
-                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                        <nil key="textColor"/>
-                                                        <nil key="highlightedColor"/>
-                                                    </label>
-                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AWr-xT-1B9">
-                                                        <rect key="frame" x="80" y="0.0" width="90" height="33"/>
-                                                        <subviews>
-                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="woP-YL-H2D" userLabel="Language Button">
-                                                                <rect key="frame" x="0.0" y="0.0" width="90" height="33"/>
-                                                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                                                <connections>
-                                                                    <action selector="languageTapped:" destination="Muw-p4-tJJ" eventType="touchUpInside" id="HSi-iw-6s6"/>
-                                                                </connections>
-                                                            </button>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="English" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pn7-Hk-5xj">
-                                                                <rect key="frame" x="0.0" y="0.0" width="90" height="33"/>
-                                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                <nil key="textColor"/>
-                                                                <nil key="highlightedColor"/>
-                                                            </label>
-                                                        </subviews>
-                                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                                        <constraints>
-                                                            <constraint firstItem="woP-YL-H2D" firstAttribute="trailing" secondItem="AWr-xT-1B9" secondAttribute="trailing" id="4vH-aB-bYN"/>
-                                                            <constraint firstItem="woP-YL-H2D" firstAttribute="leading" secondItem="AWr-xT-1B9" secondAttribute="leading" id="DZ3-Dz-ssa"/>
-                                                            <constraint firstItem="Pn7-Hk-5xj" firstAttribute="leading" secondItem="AWr-xT-1B9" secondAttribute="leading" id="KYi-Ln-EYA"/>
-                                                            <constraint firstAttribute="bottom" secondItem="woP-YL-H2D" secondAttribute="bottom" id="SKR-gM-h1t"/>
-                                                            <constraint firstItem="Pn7-Hk-5xj" firstAttribute="top" secondItem="AWr-xT-1B9" secondAttribute="top" id="UHU-cB-t3U"/>
-                                                            <constraint firstAttribute="bottom" secondItem="Pn7-Hk-5xj" secondAttribute="bottom" id="chE-Sf-H5L"/>
-                                                            <constraint firstItem="Pn7-Hk-5xj" firstAttribute="trailing" secondItem="AWr-xT-1B9" secondAttribute="trailing" id="fa9-G9-FFM"/>
-                                                            <constraint firstItem="woP-YL-H2D" firstAttribute="top" secondItem="AWr-xT-1B9" secondAttribute="top" id="ufV-uj-YsC"/>
-                                                        </constraints>
-                                                    </view>
-                                                </subviews>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="170" id="3cq-rL-5dd"/>
-                                                    <constraint firstItem="QxD-Of-5dx" firstAttribute="leading" secondItem="nDV-E0-5BI" secondAttribute="leading" id="NN9-em-a1E"/>
-                                                    <constraint firstAttribute="height" constant="33" id="cJE-4J-UNy"/>
-                                                    <constraint firstItem="AWr-xT-1B9" firstAttribute="leading" secondItem="QxD-Of-5dx" secondAttribute="trailing" id="qvY-7i-rs3"/>
-                                                    <constraint firstItem="AWr-xT-1B9" firstAttribute="trailing" secondItem="nDV-E0-5BI" secondAttribute="trailing" id="yKv-nF-frp"/>
-                                                </constraints>
-                                            </stackView>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="8xV-Pd-ntQ">
-                                                <rect key="frame" x="94.666666666666686" y="67" width="186" height="55"/>
+                                                <rect key="frame" x="94.666666666666671" y="96.333333333333343" width="238.66666666666663" height="55"/>
                                                 <color key="tintColor" name="Logo"/>
                                             </imageView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="3Hy-2P-EJV" userLabel="Login Stack View">
-                                                <rect key="frame" x="47" y="152" width="281" height="78"/>
+                                                <rect key="frame" x="53.666666666666657" y="181.33333333333331" width="321" height="78"/>
                                                 <subviews>
                                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qGm-EW-OID">
-                                                        <rect key="frame" x="0.0" y="0.0" width="281" height="34"/>
+                                                        <rect key="frame" x="0.0" y="0.0" width="321" height="34"/>
                                                         <subviews>
                                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="https://" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dUY-1H-zKT">
                                                                 <rect key="frame" x="0.0" y="0.0" width="47.666666666666664" height="34"/>
@@ -93,16 +43,16 @@
                                                                 <nil key="textColor"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorksサーバ" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Rra-md-EVd">
-                                                                <rect key="frame" x="47.666666666666664" y="0.0" width="123.66666666666669" height="34"/>
+                                                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="252" horizontalCompressionResistancePriority="749" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorksサーバ" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Rra-md-EVd">
+                                                                <rect key="frame" x="47.666666666666671" y="0.0" width="142.33333333333331" height="34"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <textInputTraits key="textInputTraits"/>
                                                                 <connections>
                                                                     <outlet property="delegate" destination="Muw-p4-tJJ" id="EbW-g8-ER9"/>
                                                                 </connections>
                                                             </textField>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="/" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mmq-EM-bmp">
-                                                                <rect key="frame" x="171.33333333333334" y="0.0" width="10" height="34"/>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mmq-EM-bmp">
+                                                                <rect key="frame" x="190" y="0.0" width="10" height="34"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="10" id="rHT-69-2bh"/>
                                                                 </constraints>
@@ -110,8 +60,8 @@
                                                                 <nil key="textColor"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorks" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="lHB-Zh-MQx">
-                                                                <rect key="frame" x="181.33333333333334" y="0.0" width="99.666666666666657" height="34"/>
+                                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorks" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="lHB-Zh-MQx">
+                                                                <rect key="frame" x="200" y="0.0" width="121" height="34"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <textInputTraits key="textInputTraits"/>
                                                                 <connections>
@@ -121,7 +71,7 @@
                                                         </subviews>
                                                     </stackView>
                                                     <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W0b-va-UXh">
-                                                        <rect key="frame" x="0.0" y="44" width="281" height="34"/>
+                                                        <rect key="frame" x="0.0" y="44" width="321" height="34"/>
                                                         <color key="backgroundColor" name="DarkMauve"/>
                                                         <state key="normal" title="接続"/>
                                                         <state key="disabled">
@@ -145,16 +95,16 @@
                                                 </subviews>
                                             </stackView>
                                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5IT-4z-wWP" userLabel="Client Certificate Setting View">
-                                                <rect key="frame" x="47" y="279" width="281" height="20.666666666666686"/>
+                                                <rect key="frame" x="53.666666666666657" y="308.33333333333331" width="321" height="20.666666666666686"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="※クライアント証明書設定済" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CD9-F6-j5Y">
-                                                        <rect key="frame" x="78.333333333333329" y="2" width="179.66666666666669" height="17"/>
+                                                        <rect key="frame" x="118.33333333333337" y="2" width="179.66666666666663" height="17"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                         <color key="textColor" name="DarkGray"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4W4-CG-MTM" userLabel="Client Certificate Removal Button">
-                                                        <rect key="frame" x="262" y="0.0" width="19" height="20.666666666666668"/>
+                                                        <rect key="frame" x="302" y="0.0" width="19" height="20.666666666666668"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                         <color key="tintColor" name="DarkMauve"/>
                                                         <state key="normal" image="trash.fill" catalog="system"/>
@@ -173,16 +123,16 @@
                                                 </constraints>
                                             </view>
                                             <view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0QN-lE-A8b" userLabel="QRCode Read View">
-                                                <rect key="frame" x="47" y="245" width="281" height="19"/>
+                                                <rect key="frame" x="53.666666666666657" y="274.33333333333331" width="321" height="19"/>
                                                 <subviews>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="QRコードリード" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oDi-1K-fPP" userLabel="QRコードリード">
-                                                        <rect key="frame" x="147" y="1" width="105.33333333333331" height="17"/>
+                                                        <rect key="frame" x="187" y="1" width="105.33333333333331" height="17"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                         <color key="textColor" name="DarkGray"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="B5D-Cm-PQs" userLabel="Camera Startup Button">
-                                                        <rect key="frame" x="256.33333333333331" y="0.0" width="24.666666666666686" height="19"/>
+                                                        <rect key="frame" x="296.33333333333331" y="0.0" width="24.666666666666686" height="19"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                         <color key="tintColor" name="DarkMauve"/>
                                                         <state key="normal" image="camera.fill" catalog="system"/>
@@ -200,27 +150,24 @@
                                                     <constraint firstItem="B5D-Cm-PQs" firstAttribute="top" secondItem="0QN-lE-A8b" secondAttribute="top" id="t6j-ds-QB6"/>
                                                 </constraints>
                                             </view>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4LY-tr-xFi" userLabel="AppVersion">
-                                                <rect key="frame" x="250" y="78" width="42" height="21"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4LY-tr-xFi" userLabel="AppVersion">
+                                                <rect key="frame" x="345.33333333333331" y="159.33333333333331" width="0.0" height="0.0"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                 <color key="textColor" name="Gray"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <view hidden="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Eac-pO-PpC" userLabel="Disabling View">
-                                                <rect key="frame" x="8" y="-103" width="375" height="734"/>
-                                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Eac-pO-PpC" userLabel="Disabling View">
+                                                <rect key="frame" x="0.0" y="-80" width="428" height="848"/>
                                                 <color key="backgroundColor" white="1" alpha="0.5" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                             </view>
                                         </subviews>
                                         <constraints>
-                                            <constraint firstItem="nDV-E0-5BI" firstAttribute="trailing" secondItem="3Hy-2P-EJV" secondAttribute="trailing" id="4ae-ds-ceP"/>
                                             <constraint firstItem="3Hy-2P-EJV" firstAttribute="width" secondItem="Hb3-Nf-olK" secondAttribute="width" multiplier="0.75" id="5Ai-cJ-mqd"/>
                                             <constraint firstItem="5IT-4z-wWP" firstAttribute="leading" secondItem="0QN-lE-A8b" secondAttribute="leading" id="Ikz-Nm-KF4"/>
-                                            <constraint firstItem="nDV-E0-5BI" firstAttribute="top" secondItem="Hb3-Nf-olK" secondAttribute="top" constant="4" id="KNN-rg-ipt"/>
                                             <constraint firstItem="5IT-4z-wWP" firstAttribute="trailing" secondItem="0QN-lE-A8b" secondAttribute="trailing" id="MI9-Z1-cxz"/>
                                             <constraint firstItem="4LY-tr-xFi" firstAttribute="bottom" secondItem="8xV-Pd-ntQ" secondAttribute="bottom" constant="8" id="QOX-OC-9C4"/>
-                                            <constraint firstItem="8xV-Pd-ntQ" firstAttribute="top" secondItem="nDV-E0-5BI" secondAttribute="bottom" constant="30" id="Qj3-oy-qYf"/>
                                             <constraint firstItem="0QN-lE-A8b" firstAttribute="top" secondItem="3Hy-2P-EJV" secondAttribute="bottom" constant="15" id="Uqb-n6-Zgd"/>
+                                            <constraint firstItem="8xV-Pd-ntQ" firstAttribute="leading" secondItem="Hb3-Nf-olK" secondAttribute="leading" constant="94.666666666666686" id="VHs-QE-tRo"/>
                                             <constraint firstItem="0QN-lE-A8b" firstAttribute="trailing" secondItem="3Hy-2P-EJV" secondAttribute="trailing" id="eno-jL-5xJ"/>
                                             <constraint firstItem="3Hy-2P-EJV" firstAttribute="centerX" secondItem="Hb3-Nf-olK" secondAttribute="centerX" id="ipQ-2w-8qc"/>
                                             <constraint firstItem="5IT-4z-wWP" firstAttribute="top" secondItem="0QN-lE-A8b" secondAttribute="bottom" constant="15" id="ix7-4G-tAZ"/>
@@ -235,7 +182,8 @@
                                 </subviews>
                                 <constraints>
                                     <constraint firstItem="A5c-Ll-Dk9" firstAttribute="height" secondItem="Hb3-Nf-olK" secondAttribute="height" id="MoC-bz-l7l"/>
-                                    <constraint firstItem="Hb3-Nf-olK" firstAttribute="top" secondItem="A5c-Ll-Dk9" secondAttribute="top" constant="100" id="Mu4-4S-Dr2"/>
+                                    <constraint firstItem="Hb3-Nf-olK" firstAttribute="top" secondItem="A5c-Ll-Dk9" secondAttribute="top" constant="80" id="Mu4-4S-Dr2"/>
+                                    <constraint firstItem="VDM-GZ-B2a" firstAttribute="bottom" secondItem="Hb3-Nf-olK" secondAttribute="bottom" multiplier="2" id="gIL-ua-Lbc"/>
                                     <constraint firstItem="Hb3-Nf-olK" firstAttribute="leading" secondItem="yLq-r2-C5q" secondAttribute="leading" id="jct-6B-zyk"/>
                                     <constraint firstItem="Hb3-Nf-olK" firstAttribute="centerX" secondItem="yLq-r2-C5q" secondAttribute="centerX" id="muJ-D2-gYI"/>
                                     <constraint firstAttribute="trailing" secondItem="Hb3-Nf-olK" secondAttribute="trailing" id="qWt-bn-TrM"/>
@@ -247,10 +195,14 @@
                         <viewLayoutGuide key="safeArea" id="3Ny-53-cGf"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
+                            <constraint firstItem="3Ny-53-cGf" firstAttribute="bottom" secondItem="Eac-pO-PpC" secondAttribute="bottom" id="Baa-ik-nRw"/>
+                            <constraint firstItem="3Ny-53-cGf" firstAttribute="leading" secondItem="Eac-pO-PpC" secondAttribute="leading" id="JmJ-ni-OZF"/>
+                            <constraint firstItem="3Ny-53-cGf" firstAttribute="trailing" secondItem="Eac-pO-PpC" secondAttribute="trailing" id="N5P-KW-o2K"/>
                             <constraint firstItem="yLq-r2-C5q" firstAttribute="leading" secondItem="3Ny-53-cGf" secondAttribute="leading" id="eSY-Nk-omN"/>
                             <constraint firstItem="yLq-r2-C5q" firstAttribute="trailing" secondItem="3Ny-53-cGf" secondAttribute="trailing" id="ox6-24-j6X"/>
                             <constraint firstItem="yLq-r2-C5q" firstAttribute="bottom" secondItem="3Ny-53-cGf" secondAttribute="bottom" id="tE3-Av-QIH"/>
                             <constraint firstItem="yLq-r2-C5q" firstAttribute="top" secondItem="3Ny-53-cGf" secondAttribute="top" id="waG-Iw-Bgi"/>
+                            <constraint firstItem="3Ny-53-cGf" firstAttribute="top" secondItem="Eac-pO-PpC" secondAttribute="top" id="xX8-2A-pjI"/>
                         </constraints>
                     </view>
                     <connections>
@@ -261,8 +213,6 @@
                         <outlet property="contextTextField" destination="lHB-Zh-MQx" id="0DV-B4-C9n"/>
                         <outlet property="disablingView" destination="Eac-pO-PpC" id="pp8-Ex-Y2i"/>
                         <outlet property="httpsLavel" destination="dUY-1H-zKT" id="QVv-jX-GF2"/>
-                        <outlet property="languageLabel" destination="Pn7-Hk-5xj" id="Pwk-ap-RkX"/>
-                        <outlet property="languageView" destination="AWr-xT-1B9" id="Yz0-ZD-yVh"/>
                         <outlet property="loginButton" destination="W0b-va-UXh" id="rzC-OC-nhO"/>
                         <outlet property="qrCodeReadLabel" destination="oDi-1K-fPP" id="rm0-Ni-e6r"/>
                         <outlet property="qrCodeReadView" destination="0QN-lE-A8b" id="nhQ-ss-wFb"/>
diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
index 2b38a2d..c4841c6 100644
--- a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
+++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
@@ -15,13 +15,10 @@ protocol LoginView: AnyObject {
 }
 
 class LoginViewController: UIViewController {
-    private let languageDropDown = DropDown()
     private let serverProtocol = "https://"
     private static let kValidServerPattern = try? NSRegularExpression(pattern: #"^[-a-z0-9]+(?:\.[-a-z0-9]+)*\.?(?::\d+)?$"#, options: .caseInsensitive)
     private static let kValidContextPattern = try? NSRegularExpression(pattern: #"^[a-z0-9]+"#, options: .caseInsensitive)
 
-    @IBOutlet private var languageView: UIView!
-    @IBOutlet private var languageLabel: UILabel!
     @IBOutlet private var appVersionLabel: UILabel!
     @IBOutlet private var urlStackView: UIStackView!
     @IBOutlet private var httpsLavel: UILabel!
@@ -30,7 +27,7 @@ class LoginViewController: UIViewController {
     @IBOutlet private var contextTextField: UITextField!
     @IBOutlet private var loginButton: UIButton!
     @IBOutlet private var disablingView: UIView!
-    @IBOutlet weak var clientCertificateLabel: UILabel!
+    @IBOutlet private var clientCertificateLabel: UILabel!
     @IBOutlet private var clientCertificateSettingView: UIView!
     @IBOutlet private var clientCertificateRemovalButton: UIButton!
     @IBOutlet private var qrCodeReadLabel: UILabel!
@@ -54,35 +51,27 @@ class LoginViewController: UIViewController {
 
     let qrCodeReader = QRCodeReader()
 
-    func inject(
-        presenter: LoginPresenter
-        ) {
+    func inject(presenter: LoginPresenter) {
         self.presenter = presenter
     }
 
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        createLanguageDropDown()
-
         clientCertificateSettingView.isHidden = (CertificateDataStore().readClientCertificate() == nil)
-
         //固定文言表示
-        loguinTranslation()
-
-        appVersionLabel.text = appVersionLabelText()
+        setupFixedWording()
 
         //保存されたサーバー名・コンテキストパスの取得
         let server = Configuration.shared.awServer
         let context = Configuration.shared.awContextPath
         serverTextField.text = server
         contextTextField.text = context
-
-        updateCloudUsage()
+        loginButton.isEnabled = isTextFieldValue()
 
         view.addSubview(activityIndicator)
         activityIndicator.frame = view.bounds
-        activityIndicator.backgroundColor = UIColor(named: localizadString(key: "IndicatorBackgroud", comment: ""))
+        activityIndicator.backgroundColor = UIColor(named: getLocalizableStrings(key: "IndicatorBackgroud", comment: ""))
 
         activityIndicator.translatesAutoresizingMaskIntoConstraints = false
 
@@ -95,57 +84,14 @@ class LoginViewController: UIViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)), name: UIResponder.keyboardWillHideNotification, object: nil)
     }
 
-    //言語選択（ドロップダウン）の作成
-    private func createLanguageDropDown() {
-        //現在設定中の言語
-        let language = localizadString(key: "Language", comment: "")
-        //プルダウンメニュー詳細設定
-        languageView.layer.borderColor = UIColor.black.cgColor
-        languageView.layer.borderWidth = 0.5
-        languageView.layer.cornerRadius = 5
-        languageLabel.text = language
-        languageDropDown.anchorView = languageView
-        languageDropDown.dataSource = languageArray
-        languageDropDown.backgroundColor = UIColor.white
-        languageDropDown.cornerRadius = 10
-        languageDropDown.selectRow(at: getLanguageIndex(dropDownItem: language))
-        //言語が選択されたアクションは以下に記載する
-        languageDropDown.selectionAction = { [unowned self] (index: Int, item: String) in
-            languageDropDownAction(item: item)
-          }
-    }
-
-    @IBAction private func languageTapped(_ sender: Any) {
-        //ドロップダウン表示
-        languageDropDown.show()
-    }
-
-    private func languageDropDownAction(item: String) {
-        languageLabel.text = item
-        //選択した言語をセットする
-        switch item {
-        case "English":
-            setStringsName(stringsName: "English")
-        case "日本語":
-            setStringsName(stringsName: "Japanese")
-        case "中文(簡体)":
-            setStringsName(stringsName: "Chinese-Simplified")
-        case "中文(繁体)":
-            setStringsName(stringsName: "Chinese-Traditional")
-        default:
-            setStringsName(stringsName: "Localizable")
-            languageLabel.text = localizadString(key: "Language", comment: "")
-        }
-        //ログイン画面の固定文言表示を変更する
-        loguinTranslation()
-    }
-
     //ログイン画面の固定文言表示
-    private func loguinTranslation() {
-        clientCertificateLabel.text = localizadString(key: "ClientCertificateConfigured", comment: "")
-        loginButton.setTitle(localizadString(key: "LoginButton", comment: ""), for: .normal)
-        qrCodeReadLabel.text = localizadString(key: "QRCodeReadLabel", comment: "")
-        serverTextField.placeholder = localizadString(key: "ServerURLPlaceholder", comment: "")
+    private func setupFixedWording() {
+        clientCertificateLabel.text = getLocalizableStrings(key: "ClientCertificateConfigured", comment: "")
+        loginButton.setTitle(getLocalizableStrings(key: "LoginButton", comment: ""), for: .normal)
+        qrCodeReadLabel.text = getLocalizableStrings(key: "QRCodeReadLabel", comment: "")
+        serverTextField.placeholder = getLocalizableStrings(key: "ServerURLPlaceholder", comment: "")
+        contextTextField.placeholder = getLocalizableStrings(key: "ContextPlaceholder", comment: "")
+        appVersionLabel.text = appVersionLabelText()
     }
 
     override func viewDidLayoutSubviews() {
@@ -176,36 +122,31 @@ class LoginViewController: UIViewController {
         self.view.endEditing(true)
     }
 
-    @IBAction private func useCloudSwitchDidChange(_ sender: UISwitch) {
-        updateCloudUsage()
-    }
-
     @IBAction private func loginTapped() {
         guard let serverHost = serverHost else { return }
         guard let context = context else { return }
 
         disableLogin()
-
         //サーバー名コンテキストパスの保存
         KeychainDataStore().writeServerURL(serverURL: serverHost)
         KeychainDataStore().writeContextPath(contextPath: context)
 
-        presenter.fetch() { result in
+        presenter.fetch { result in
             switch result {
             case .success:
                 self.setSessionId()
             case .failure(let error):
                 log.e(error)
                 DispatchQueue.main.async {
-                    let message = localizadString(key: "LoginErrorMessage", comment: "")
-                    let okAction = UIAlertAction(title: localizadString(key: "OK", comment: ""), style: .default, handler: nil)
+                    let message = getLocalizableStrings(key: "LoginErrorMessage", comment: "")
+                    let okAction = UIAlertAction(title: getLocalizableStrings(key: "OK", comment: ""), style: .default, handler: nil)
                     AppDelegate.shared.rootViewController.showAlertScreen(view: self, title: "", message: message, defaultAction: okAction, cancelAction: nil)
                     self.enableLogin()
                 }
             }
         }
     }
-    
+
     //sessionIdの取得
     private func setSessionId() {
         let sessionEndpoint = GetSessionEndpoint()
@@ -221,38 +162,11 @@ class LoginViewController: UIViewController {
                 }
             // セッション情報取得失敗
             case .failure(let error):
-                var refreshError = false
                 log.e(error)
-                switch error {
-                case .connectionError(let err):
-                    switch err {
-                    case ResponseError.tokenInvalid:
-                        refreshError = true
-                    default:
-                        break
-                    }
-                case .requestError(_):
-                    break
-                case .responseStatusError(_):
-                    break
-                case .responseError(_):
-                    break
-                }
-                // リフレッシュトークン更新エラーの場合
-                if refreshError {
-                    DispatchQueue.main.async {
-                        let title = localizadString(key: "RefreshTokenUpdateErrorTitle", comment: "")
-                        let message = localizadString(key: "RefreshTokenUpdateError", comment: "")
-                        let defaultAction = AppDelegate.shared.rootViewController.logoutDefaultAction(title: localizadString(key: "OK", comment: ""))
-                        AppDelegate.shared.rootViewController.showAlertScreen(view: self, title: title, message: message, defaultAction: defaultAction, cancelAction: nil)
-                    }
-                // その他エラーの場合
-                } else {
-                    DispatchQueue.main.async {
-                        let message = localizadString(key: "UnknownNetworkError", comment: "")
-                        let defaultAction = UIAlertAction(title: localizadString(key: "OK", comment: ""), style: .default) { _ in }
-                        AppDelegate.shared.rootViewController.showAlertScreen(view: self, title: "", message: message, defaultAction: defaultAction, cancelAction: nil)
-                    }
+                DispatchQueue.main.async {
+                    let message = getLocalizableStrings(key: "LoginErrorMessage", comment: "")
+                    let defaultAction = AppDelegate.shared.rootViewController.logoutDefaultAction(title: getLocalizableStrings(key: "OK", comment: ""))
+                    AppDelegate.shared.rootViewController.showAlertScreen(view: self, title: "", message: message, defaultAction: defaultAction, cancelAction: nil)
                 }
             }
         }
@@ -267,22 +181,16 @@ class LoginViewController: UIViewController {
             // 読み込めるカメラ範囲設定
             qrCodeReader.readRange()
             // ガイダンス設定
-            qrCodeReader.setCameraGuide(guide: localizadString(key: "QRCodeReadGuidance", comment: ""))
+            qrCodeReader.setCameraGuide(guide: getLocalizableStrings(key: "QRCodeReadGuidance", comment: ""))
         } else {
             qrCodeReader.delegate = nil
             // カメラ起動失敗
-            let message = localizadString(key: "CameraStartupErrorMessage", comment: "")
-            let defaultAction = UIAlertAction(title: localizadString(key: "OK", comment: ""), style: .default) { _ in }
+            let message = getLocalizableStrings(key: "CameraStartupErrorMessage", comment: "")
+            let defaultAction = UIAlertAction(title: getLocalizableStrings(key: "OK", comment: ""), style: .default) { _ in }
             AppDelegate.shared.rootViewController.showAlertScreen(view: self, title: "", message: message, defaultAction: defaultAction, cancelAction: nil)
         }
     }
 
-    private func updateCloudUsage() {
-        serverTextField.placeholder = localizadString(key: "ServerURLPlaceholder", comment: "")
-        contextTextField.placeholder = localizadString(key: "ContextPlaceholder", comment: "")
-        loginButton.isEnabled = isTextFieldValue()
-    }
-
     //テキストフィールド入力値チェック
     private func isTextFieldValue() -> Bool {
         let isServer = isValidInput(textField: serverTextField, text: serverTextField.text)
@@ -339,12 +247,12 @@ class LoginViewController: UIViewController {
     }
 
     @IBAction private func clientCertificateRemovalTapped(_ sender: Any) {
-        let alertController = UIAlertController(title: "", message: localizadString(key: "ClientCertificateRemovalConfirmation", comment: ""), preferredStyle: .alert)
-        let okAction = UIAlertAction(title:localizadString(key: "ClientCertificateRemovalOK", comment: ""), style: .default) { _ in
+        let alertController = UIAlertController(title: "", message: getLocalizableStrings(key: "ClientCertificateRemovalConfirmation", comment: ""), preferredStyle: .alert)
+        let okAction = UIAlertAction(title: getLocalizableStrings(key: "ClientCertificateRemovalOK", comment: ""), style: .default) { _ in
             CertificateDataStore().removeClientCertificate()
             self.clientCertificateSettingView.isHidden = true
         }
-        let cancelAction = UIAlertAction(title: localizadString(key: "ClientCertificateRemovalCancel", comment: ""), style: .cancel, handler: nil)
+        let cancelAction = UIAlertAction(title: getLocalizableStrings(key: "ClientCertificateRemovalCancel", comment: ""), style: .cancel, handler: nil)
         alertController.addAction(okAction)
         alertController.addAction(cancelAction)
         present(alertController, animated: true, completion: nil)
diff --git a/AgileWorks/Common/Utility/StringsUtility.swift b/AgileWorks/Common/Utility/StringsUtility.swift
index f9c04d0..d579478 100644
--- a/AgileWorks/Common/Utility/StringsUtility.swift
+++ b/AgileWorks/Common/Utility/StringsUtility.swift
@@ -10,9 +10,6 @@ import Foundation
 
 //多言語対応
 
-//言語の種類
-let languageArray = [getLocalizableStrings(key: "Language", comment: ""), "日本語", "English", "中文(簡体)", "中文(繁体)"]
-
 //言語を設定する
 func setStringsName(stringsName: String) {
     KeychainDataStore().writeLanguage(language: stringsName)
@@ -37,16 +34,3 @@ private func getLocalizableStrings(key: String, comment: String) -> String {
 func localizadString(key: String, comment: String) -> String {
     return NSLocalizedString(key, tableName: getStringsFileName(), comment: comment)
 }
-
-//選択中の言語の要素番号を返す
-func getLanguageIndex(dropDownItem: String) -> Int {
-    var index = 0
-    for language in languageArray {
-        if language == dropDownItem {
-            return index
-        }else {
-            index += 1
-        }
-    }
-    return 0
-}
-- 
GitLab


From ae2169d2f1d7ab1709f92002bb55a8d4fd49be26 Mon Sep 17 00:00:00 2001
From: Gk40002148 <yamaguchi.yuudai@nttdata-sbc.co.jp>
Date: Mon, 11 Apr 2022 16:22:52 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=80=E9=83=A8=E9=96=A2=E6=95=B0?=
 =?UTF-8?q?=E3=82=92public=20=E3=81=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AgileWorks/Common/Utility/StringsUtility.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AgileWorks/Common/Utility/StringsUtility.swift b/AgileWorks/Common/Utility/StringsUtility.swift
index d579478..2567e1f 100644
--- a/AgileWorks/Common/Utility/StringsUtility.swift
+++ b/AgileWorks/Common/Utility/StringsUtility.swift
@@ -26,7 +26,7 @@ func getStringsFileName() -> String {
 }
 
 //OSで設定している言語を取得する
-private func getLocalizableStrings(key: String, comment: String) -> String {
+func getLocalizableStrings(key: String, comment: String) -> String {
     return NSLocalizedString(key, tableName: "Localizable", comment: comment)
 }
 
-- 
GitLab


From 96b97b0cd5544ae2e8952f01795ab8296933040d Mon Sep 17 00:00:00 2001
From: Gk40002148 <yamaguchi.yuudai@nttdata-sbc.co.jp>
Date: Wed, 13 Apr 2022 13:36:15 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=E3=83=A1=E3=82=A4=E3=83=B3=E7=94=BB?=
 =?UTF-8?q?=E9=9D=A2=E8=B5=B7=E5=8B=95=E6=99=82=E3=83=BB=E3=82=BF=E3=83=96?=
 =?UTF-8?q?=E9=81=B8=E6=8A=9E=E6=99=82=E3=81=AB=E8=A8=80=E8=AA=9E=E8=A8=AD?=
 =?UTF-8?q?=E5=AE=9A=E3=81=AB=E5=BF=9C=E3=81=98=E3=81=9F=E6=96=87=E8=A8=80?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=82=92=E8=A1=8C=E3=81=86=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AgileWorks/App/RootViewController.swift   |  1 +
 .../Login/View/LoginViewController.swift      |  1 +
 .../Main/Builder/MainTabBarViewBuilder.swift  |  5 ++
 .../Main/View/MainTabBarViewController.swift  | 43 +++++++++++
 .../Wireframe/MainTabBarViewWireframe.swift   |  3 -
 .../WebView/View/WebViewController.swift      | 75 ++++++++++++-------
 .../Common/Utility/StringsUtility.swift       | 17 ++++-
 7 files changed, 113 insertions(+), 32 deletions(-)

diff --git a/AgileWorks/AgileWorks/App/RootViewController.swift b/AgileWorks/AgileWorks/App/RootViewController.swift
index 285463f..923b4b6 100644
--- a/AgileWorks/AgileWorks/App/RootViewController.swift
+++ b/AgileWorks/AgileWorks/App/RootViewController.swift
@@ -67,6 +67,7 @@ extension RootViewController {
                 KeychainDataStore().removeOAuthState()
                 KeychainDataStore().removeAccessToken()
                 KeychainDataStore().removeSessionID()
+                KeychainDataStore().removeLanguage()
                 KeychainDataStore().removeDeviceID()
 
                 DispatchQueue.main.async {
diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
index c4841c6..efbfca4 100644
--- a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
+++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
@@ -155,6 +155,7 @@ class LoginViewController: UIViewController {
             switch result {
             // セッション情報取得成功
             case .success(let response):
+                setStringsName(language: response.user.displayLanguage)
                 KeychainDataStore().writeSessionID(sessionID: response.sessionId)
                 DispatchQueue.main.async {
                     //メイン画面表示
diff --git a/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift b/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift
index 80019a5..194392f 100644
--- a/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift
+++ b/AgileWorks/AgileWorks/Main/Builder/MainTabBarViewBuilder.swift
@@ -66,30 +66,35 @@ extension MainTabBarViewBuilderImpl {
             //view.tabBarItem.selectedItem = ""
             viewVC.loadURL = createLoadUrl(urlPath: ViewURL.home.rawValue)
             viewVC.naviTitle = localizadString(key: "HomeTitle", comment: "")
+            viewVC.tabTitleKey = "HomeTitle"
         case ViewType.work.rawValue:
             view.tabBarItem.title = localizadString(key: "WorkTitle", comment: "")
             //view.tabBarItem.image = ""
             //view.tabBarItem.selectedItem = ""
             viewVC.loadURL = createLoadUrl(urlPath: ViewURL.work.rawValue)
             viewVC.naviTitle = localizadString(key: "WorkTitle", comment: "")
+            viewVC.tabTitleKey = "WorkTitle"
         case ViewType.documents.rawValue:
             view.tabBarItem.title = localizadString(key: "DocumentsTitle", comment: "")
             //view.tabBarItem.image = ""
             //view.tabBarItem.selectedItem = ""
             viewVC.loadURL = ViewURL.documents.rawValue
             viewVC.naviTitle = localizadString(key: "DocumentsTitle", comment: "")
+            viewVC.tabTitleKey = "DocumentsTitle"
         case ViewType.search.rawValue:
             view.tabBarItem.title = localizadString(key: "SearchTitle", comment: "")
             //view.tabBarItem.image = ""
             //view.tabBarItem.selectedItem = ""
             viewVC.loadURL = createLoadUrl(urlPath: ViewURL.search.rawValue)
             viewVC.naviTitle = localizadString(key: "SearchTitle", comment: "")
+            viewVC.tabTitleKey = "SearchTitle"
         default:
             view.tabBarItem.title = localizadString(key: "HomeTitle", comment: "")
             //view.tabBarItem.image = ""
             //view.tabBarItem.selectedItem = ""
             viewVC.loadURL = createLoadUrl(urlPath: ViewURL.home.rawValue)
             viewVC.naviTitle = localizadString(key: "HomeTitle", comment: "")
+            viewVC.tabTitleKey = "HomeTitle"
         }
         return view
     }
diff --git a/AgileWorks/AgileWorks/Main/View/MainTabBarViewController.swift b/AgileWorks/AgileWorks/Main/View/MainTabBarViewController.swift
index 5037bd2..48e98eb 100644
--- a/AgileWorks/AgileWorks/Main/View/MainTabBarViewController.swift
+++ b/AgileWorks/AgileWorks/Main/View/MainTabBarViewController.swift
@@ -54,6 +54,23 @@ class MainTabBarViewController: UITabBarController {
         }
         navigation.popViewController(animated: false)
     }
+    // 固定文言設定
+    func setupFixedWording() {
+        // タブタイトル設定
+        for view in self.children {
+            if let navi = view as? UINavigationController {
+                if let webView = navi.viewControllers[navi.viewControllers.count - 1] as? WebViewController {
+                    navi.tabBarItem.title = localizadString(key: webView.tabTitleKey, comment: "")
+                }
+            }
+        }
+        // 表示中タブ内のView固定文言設定
+        if let navi = self.selectedViewController as? UINavigationController {
+            if let webView = navi.viewControllers[navi.viewControllers.count - 1] as? WebViewController {
+                webView.setupFixedWording()
+            }
+        }
+    }
 }
 
 extension MainTabBarViewController: UITabBarControllerDelegate {
@@ -63,4 +80,30 @@ extension MainTabBarViewController: UITabBarControllerDelegate {
         }
         return true
     }
+    func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) {
+        // 選択した TabBarController のリロード
+        if let navi = tabBarController.selectedViewController as? UINavigationController {
+            if let webView = navi.viewControllers[navi.viewControllers.count - 1] as? WebViewController {
+                webView.loadViewIfNeeded()
+                webView.reloadWebView()
+            }
+        }
+        // 多言語対応
+        let sessionEndpoint = GetSessionEndpoint()
+
+        Session.send(sessionEndpoint) { result in
+            switch result {
+            // セッション情報取得成功
+            case .success(let response):
+                setStringsName(language: response.user.displayLanguage)
+                // 固定文言再設定
+                DispatchQueue.main.async {
+                    self.setupFixedWording()
+                }
+            // セッション情報取得失敗
+            case .failure(let error):
+                log.e(error)
+            }
+        }
+    }
 }
diff --git a/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift b/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift
index 368a239..12f8b1c 100644
--- a/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift
+++ b/AgileWorks/AgileWorks/Main/Wireframe/MainTabBarViewWireframe.swift
@@ -28,7 +28,6 @@ extension MainTabBarViewWireframeImpl: MainTabBarViewWireframe {
         let workNum = 1
         viewController.selectedIndex = workNum
 
-        let storyboard = UIStoryboard(name: "WebViewController", bundle: nil)
         let view = viewController.children[workNum] as! UINavigationController
         let workVC = view.viewControllers[view.viewControllers.count - 1] as! WebViewController
 
@@ -56,7 +55,6 @@ extension MainTabBarViewWireframeImpl: MainTabBarViewWireframe {
             // されていない場合、そのままモーダル表示
             self.viewController.present(nav, animated: true, completion: nil)
         }
-
     }
 
     // 書類上書き確認アラート表示
@@ -76,5 +74,4 @@ extension MainTabBarViewWireframeImpl: MainTabBarViewWireframe {
         // アラート表示
         AppDelegate.shared.rootViewController.showAlertScreen(view: oldNavi, title: "", message: message, defaultAction: defaultAction, cancelAction: cancelAction)
     }
-
 }
diff --git a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
index 5d93b7a..767b057 100644
--- a/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
+++ b/AgileWorks/AgileWorks/WebView/View/WebViewController.swift
@@ -18,7 +18,6 @@ class WebViewController: UIViewController {
     @IBOutlet private var closeButton: UIBarButtonItem!
     @IBOutlet private var menuButton: UIBarButtonItem!
     var mainWebView: WKWebView!
-    // WebView 表示用 JSESSIONID
     // 別ウインドウで開いたときの子ウインドウスタック
     var subViewStack = SubViewStack()
     var loadURL: String!
@@ -33,13 +32,16 @@ class WebViewController: UIViewController {
     var isShowDoc = false
     //widgetから新規タブを開く際のフラグ
     var openByWidget = false
+    // 表示中タイトルキー
+    var nowTitleKey: String!
+    var tabTitleKey: String!
     // 現在表示中のURL
     var nowURL: String!
     // 初期ロード完了フラグ
     var initLoadComp = false
 
     // Title を設定する URL を定義
-    let urlToTitle: [String: String] = [
+    var urlToTitle: [String: String] = [
         "Mobile#home": localizadString(key: "HomeTitle", comment: ""),
         "Mobile#work": localizadString(key: "WorkTitle", comment: ""),
         "Mobile#agileWorksSearch": localizadString(key: "SearchTitle", comment: "")
@@ -77,7 +79,6 @@ class WebViewController: UIViewController {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         self.navigationItem.title = naviTitle
-        self.tabBarController?.delegate = self
     }
 
     // WebView セットアップ
@@ -141,7 +142,7 @@ class WebViewController: UIViewController {
 
         mainWebView.load(request)
     }
-    
+
     // WidgetからWebView ロード処理
     func widgetLoadWebView(url: String) {
         setWebView()
@@ -177,8 +178,8 @@ class WebViewController: UIViewController {
             switch result {
             // セッション情報取得成功
             case .success(let response):
+                KeychainDataStore().writeSessionID(sessionID: response.sessionId)
                 if isInit {
-                    KeychainDataStore().writeSessionID(sessionID: response.sessionId)
                     // 画面ロード
                     DispatchQueue.main.async {
                         self.setWebView()
@@ -187,7 +188,6 @@ class WebViewController: UIViewController {
                     }
                 } else {
                     // Cookie 変更
-                    KeychainDataStore().writeSessionID(sessionID: response.sessionId)
                     self.setSessionId()
                 }
             // セッション情報取得失敗
@@ -334,6 +334,48 @@ class WebViewController: UIViewController {
     private func isOnline() -> Bool {
         return self.monitor.currentPath.status == .satisfied
     }
+    // WebView Reload
+    func reloadWebView() {
+        var viewReload = false
+        if subViewStack.isEmpty {
+            if loadURL != nowURL {
+                viewReload = true
+            } else if !initLoadComp {
+                viewReload = true
+            }
+        } else {
+            viewReload = true
+            while subViewStack.pop() != nil {
+            }
+        }
+        if viewReload {
+            setWebView()
+            loadWebView(url: self.loadURL)
+        }
+    }
+    //ログイン画面の固定文言表示
+    func setupFixedWording() {
+        urlToTitle = [
+            "Mobile#home": localizadString(key: "HomeTitle", comment: ""),
+            "Mobile#work": localizadString(key: "WorkTitle", comment: ""),
+            "Mobile#agileWorksSearch": localizadString(key: "SearchTitle", comment: "")
+        ]
+        if self.nowTitleKey != nil {
+            for (key, value) in urlToTitle {
+                if self.nowTitleKey.contains(key) {
+                    // タイトルの再設定
+                    naviTitle = value
+                    break
+                }
+            }
+        } else {
+            // タイトルの再設定
+            naviTitle = localizadString(key: tabTitleKey, comment: "")
+        }
+        self.navigationItem.title = naviTitle
+        disconnectLabel.text = localizadString(key: "DisconnectNetworkLabel", comment: "")
+        checkConnectButton.setTitle(localizadString(key: "CheckConnectButton", comment: ""), for: .normal)
+    }
 }
 
 extension WebViewController: WKUIDelegate {
@@ -404,24 +446,3 @@ extension WebViewController: UIScrollViewDelegate {
         scrollView.pinchGestureRecognizer?.isEnabled = false
     }
 }
-
-extension WebViewController: UITabBarControllerDelegate {
-    func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) {
-        var viewReload = false
-        if subViewStack.isEmpty {
-            if loadURL != nowURL {
-                viewReload = true
-            } else if !initLoadComp {
-                viewReload = true
-            }
-        } else {
-            viewReload = true
-            while subViewStack.pop() != nil {
-            }
-        }
-        if viewReload {
-            setWebView()
-            loadWebView(url: self.loadURL)
-        }
-    }
-}
diff --git a/AgileWorks/Common/Utility/StringsUtility.swift b/AgileWorks/Common/Utility/StringsUtility.swift
index 2567e1f..3e00477 100644
--- a/AgileWorks/Common/Utility/StringsUtility.swift
+++ b/AgileWorks/Common/Utility/StringsUtility.swift
@@ -11,8 +11,21 @@ import Foundation
 //多言語対応
 
 //言語を設定する
-func setStringsName(stringsName: String) {
-    KeychainDataStore().writeLanguage(language: stringsName)
+func setStringsName(language: String) {
+    var settingValue = ""
+    switch language {
+    case "en":
+        settingValue = "English"
+    case "ja":
+        settingValue = "Japanese"
+    case "zh_CN":
+        settingValue = "Chinese-Simplified"
+    case "zh_TW":
+        settingValue = "Chinese-Traditional"
+    default:
+        settingValue = "Localizable"
+    }
+    KeychainDataStore().writeLanguage(language: settingValue)
 }
 
 //設定中の言語ファイル(stringsファイル)名を取得する
-- 
GitLab