From: Akash Kumar Date: Tue, 17 Dec 2024 06:23:31 +0000 (+0530) Subject: Implement multi-language support X-Git-Tag: accepted/tizen/unified/20250113.133501~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F01%2F316701%2F3;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsetting-wifi-direct.git Implement multi-language support This patch: - Make changes to support multiple language based on system language. - Add text resource files for English and Korean language. - After this patch application will support English and Korean language. Change-Id: I0668bdb1c9c2fc2903f52d95e870e906b78932ac Signed-off-by: Akash Kumar --- diff --git a/SettingWiFiDirect/SettingWiFiDirect.sln b/SettingWiFiDirect/SettingWiFiDirect.sln index 4622554..e31351d 100644 --- a/SettingWiFiDirect/SettingWiFiDirect.sln +++ b/SettingWiFiDirect/SettingWiFiDirect.sln @@ -1,13 +1,9 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31005.135 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.12.35527.113 d17.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingWiFiDirect", "SettingWiFiDirect\SettingWiFiDirect.csproj", "{9669460b-4892-4139-9074-dd9df359ddba}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8f19bdad-b6a0-40bd-8e44-9dd8e5c1aed4}" - ProjectSection(SolutionItems) = preProject - tizen_workspace.yaml = tizen_workspace.yaml - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SettingWiFiDirect", "SettingWiFiDirect\SettingWiFiDirect.csproj", "{9669460B-4892-4139-9074-DD9DF359DDBA}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,11 +11,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9669460b-4892-4139-9074-dd9df359ddba}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9669460b-4892-4139-9074-dd9df359ddba}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9669460b-4892-4139-9074-dd9df359ddba}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9669460b-4892-4139-9074-dd9df359ddba}.Release|Any CPU.Build.0 = Release|Any CPU - + {9669460B-4892-4139-9074-DD9DF359DDBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9669460B-4892-4139-9074-DD9DF359DDBA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9669460B-4892-4139-9074-DD9DF359DDBA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9669460B-4892-4139-9074-DD9DF359DDBA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs b/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs index ac98992..b204d3b 100644 --- a/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs +++ b/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.cs @@ -8,6 +8,7 @@ using Tizen.NUI.Binding; using Tizen.NUI.Components; using SettingCore; using static SettingWiFiDirect.Logger; +using SettingWiFiDirect.TextResources; namespace SettingWiFiDirect @@ -17,7 +18,7 @@ namespace SettingWiFiDirect private WiFiDirect mWifiDirect; private PeerSource mPeerSource; private CollectionView mScanList; - public override string ProvideTitle() => Resources.IDS_WIFI_BODY_WI_FI_DIRECT_ABB; + public override string ProvideTitle() => NUIGadgetResourceManager.GetString(nameof(Resources.IDS_WIFI_BODY_WI_FI_DIRECT_ABB)); protected override void OnCustomizationUpdate(IEnumerable items) { @@ -27,7 +28,7 @@ namespace SettingWiFiDirect public MainPage() { - mPeerSource = new PeerSource(); + Debug("+"); mWifiDirect = new WiFiDirect(); mWifiDirect.Activate(); try @@ -56,7 +57,8 @@ namespace SettingWiFiDirect { Debug("+"); base.OnCreate(); - + ResourceManager.TextResourceManager = this; + mPeerSource = new PeerSource(); return CreateComponents(); } @@ -215,7 +217,9 @@ namespace SettingWiFiDirect private TextLabel GetHeader() { Debug("+"); - string label = string.Format(Resources.IDS_WIFI_BODY_YOUR_DEVICE_HPS_IS_CURRENTLY_VISIBLE_TO_NEARBY_DEVICES, mWifiDirect.getDeviceName()); + string headerString = NUIGadgetResourceManager.GetString(nameof(Resources.IDS_WIFI_BODY_YOUR_DEVICE_HPS_IS_CURRENTLY_VISIBLE_TO_NEARBY_DEVICES)); + string label = string.Format(headerString, mWifiDirect.getDeviceName()); + TextLabel header = new TextLabel(label); return header; diff --git a/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.csproj b/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.csproj index 1d436b0..d6f24ba 100644 --- a/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.csproj +++ b/SettingWiFiDirect/SettingWiFiDirect/SettingWiFiDirect.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -16,4 +16,37 @@ + + + + True + True + Resources.resx + + + + + + PublicResXFileCodeGenerator + + + PublicResXFileCodeGenerator + + + PublicResXFileCodeGenerator + Resources.Designer.cs + + + + + org.tizen.appfw.gadget.setting-wifi-direct + + + + + diff --git a/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.Designer.cs b/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.Designer.cs new file mode 100644 index 0000000..cd88a28 --- /dev/null +++ b/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.Designer.cs @@ -0,0 +1,118 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace SettingWiFiDirect.TextResources { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + public class Resources + { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + + static private string mResourcePath = ""; + + static public void SetPath(string path) + { + mResourcePath = path; + } + static public string GetPath() + { + return mResourcePath; + } + internal Resources() + { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Resources.ResourceManager ResourceManager + { + get + { + if (object.ReferenceEquals(resourceMan, null)) + { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SettingWiFiDirect.TextResources.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + public static global::System.Globalization.CultureInfo Culture + { + get + { + return resourceCulture; + } + set + { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to Available. + /// + public static string IDS_CHATON_BODY_AVAILABLE { + get { + return ResourceManager.GetString("IDS_CHATON_BODY_AVAILABLE", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Wi-Fi Direct. + /// + public static string IDS_WIFI_BODY_WI_FI_DIRECT_ABB { + get { + return ResourceManager.GetString("IDS_WIFI_BODY_WI_FI_DIRECT_ABB", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Your device (%s) is currently visible to nearby devices.. + /// + public static string IDS_WIFI_BODY_YOUR_DEVICE_HPS_IS_CURRENTLY_VISIBLE_TO_NEARBY_DEVICES { + get { + return ResourceManager.GetString("IDS_WIFI_BODY_YOUR_DEVICE_HPS_IS_CURRENTLY_VISIBLE_TO_NEARBY_DEVICES", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Available devices. + /// + public static string IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB { + get { + return ResourceManager.GetString("IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB", resourceCulture); + } + } + } +} diff --git a/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.en-US.resx b/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.en-US.resx new file mode 100644 index 0000000..a137c54 --- /dev/null +++ b/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.en-US.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Available + + + Wi-Fi Direct + + + Your device ({0}) is currently visible to nearby devices. + + + Available devices + + diff --git a/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.ko-KR.resx b/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.ko-KR.resx new file mode 100644 index 0000000..6db7705 --- /dev/null +++ b/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.ko-KR.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 가능 + + + Wi-Fi 다이렉트 + + + 주변 디바이스에서 내 디바이스({0})를 검색할 수 있습니다. + + + 사용 가능한 디바이스 + + diff --git a/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.resx b/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.resx new file mode 100644 index 0000000..a137c54 --- /dev/null +++ b/SettingWiFiDirect/SettingWiFiDirect/TextResources/Resources.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Available + + + Wi-Fi Direct + + + Your device ({0}) is currently visible to nearby devices. + + + Available devices + + diff --git a/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml b/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml index 653feba..d0594e5 100644 --- a/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml +++ b/SettingWiFiDirect/SettingWiFiDirect/tizen-manifest.xml @@ -1,6 +1,6 @@ @@ -11,4 +11,6 @@ + + diff --git a/SettingWiFiDirect/SettingWiFiDirect/tizen_dotnet_project.yaml b/SettingWiFiDirect/SettingWiFiDirect/tizen_dotnet_project.yaml index 26c1f07..58dcc8b 100644 --- a/SettingWiFiDirect/SettingWiFiDirect/tizen_dotnet_project.yaml +++ b/SettingWiFiDirect/SettingWiFiDirect/tizen_dotnet_project.yaml @@ -23,16 +23,28 @@ resources: # files monitored for dirty/modified status files: + - .gn + - Build/.exportmap + - Build/BUILD.gn + - Build/BUILDCONFIG.gn + - Build/SettingWiFiDirect/BUILD.gn - Directory.Build.targets - Logger.cs - MenuProvider.cs - SettingWiFiDirect.cs - SettingWiFiDirect.csproj + - TextResources/Resources.Designer.cs + - TextResources/Resources.en-US.resx + - TextResources/Resources.ko-KR.resx + - TextResources/Resources.resx - WiFiDirectConfig.cs - controller/Interop/WiFiDirect.cs - controller/WiFiDirect.cs - model/Peer.cs - model/WfdEnumerations.cs + - res/allowed/org.tizen.appfw.gadget.setting-wifi-direct/SettingWiFiDirect.dll + - res/allowed/org.tizen.appfw.gadget.setting-wifi-direct/en-US/SettingWiFiDirect.resources.dll + - res/allowed/org.tizen.appfw.gadget.setting-wifi-direct/ko-KR/SettingWiFiDirect.resources.dll - res/icons/settings_wifi_direct.png - res/images/00_list_bar_press_1x80.png - res/images/A09_device_Medical.png @@ -56,7 +68,7 @@ files: - res/images/U04_device_STB.png - res/images/icon_select_all.png - tizen-manifest.xml - - view/Resources.cs + - view/ResourceManager.cs - view/WiFiDirectDeviceView.cs # project dependencies diff --git a/SettingWiFiDirect/SettingWiFiDirect/view/ResourceManager.cs b/SettingWiFiDirect/SettingWiFiDirect/view/ResourceManager.cs new file mode 100644 index 0000000..d1fb80b --- /dev/null +++ b/SettingWiFiDirect/SettingWiFiDirect/view/ResourceManager.cs @@ -0,0 +1,7 @@ +namespace SettingWiFiDirect +{ + internal class ResourceManager + { + public static MainPage TextResourceManager; + } +} diff --git a/SettingWiFiDirect/SettingWiFiDirect/view/Resources.cs b/SettingWiFiDirect/SettingWiFiDirect/view/Resources.cs deleted file mode 100644 index ac1f900..0000000 --- a/SettingWiFiDirect/SettingWiFiDirect/view/Resources.cs +++ /dev/null @@ -1,162 +0,0 @@ -namespace SettingWiFiDirect -{ - static class Resources - { - static private string mResourcePath = ""; - - static public void SetPath(string path) - { - mResourcePath = path; - } - static public string GetPath() - { - return mResourcePath; - } - - static public string IDS_WIFI_BODY_WI_FI_DIRECT_ABB = "Wi-Fi Direct"; - - static public string IDS_COM_POP_MAXIMUM_NUMBER_OF_CHARACTERS_REACHED = "Maximum number of characters reached."; - - static public string IDS_ST_HEADER_PD_SELECTED = "%d selected"; - - static public string IDS_ST_BUTTON_ENABLE = "Enable"; - - static public string IDS_WIFI_SK_CANCEL = "Cancel"; - - static public string IDS_WIFI_SK2_OK = "OK"; - - static public string IDS_WIFI_BODY_WI_FI = "Wi-Fi"; - - static public string IDS_WIFI_BODY_CONNECTING_ING = "Connecting..."; - - static public string IDS_WIFI_BODY_CONNECT = "Connect"; - - static public string IDS_COM_POP_SECURITY_POLICY_RESTRICTS_USE_OF_WI_FI = "Security policy restricts use of Wi-Fi."; - - static public string IDS_BT_BODY_NO_DEVICES_FOUND_ABB = "No devices found"; - - static public string IDS_BR_SK_YES = "Yes"; - - static public string IDS_BR_SK_NO = "No"; - - static public string IDS_BR_SK_CANCEL = "Cancel"; - - static public string IDS_ST_HEADER_RENAME_DEVICE = "Rename device"; - - static public string IDS_ST_HEADER_MY_DEVICE_NAME = "My device name"; - - static public string IDS_COM_POP_FAILED = "Failed."; - - static public string IDS_COM_BODY_CONNECTED_M_STATUS = "Connected"; - - static public string IDS_BR_SK_OK = "OK"; - - static public string IDS_ST_POP_DEVICE_NAMES_ARE_DISPLAYED_TO_DISTINGUISH_EACH_OF_THE_DEVICES_AVAILABLE_MSG = - "Device names are displayed to distinguish each of the devices available in the nearby devices list, and via Bluetooth, Wi-Fi Direct, and other methods."; - - static public string IDS_ST_SK_RENAME = "Rename"; - - static public string IDS_ST_POP_NOT_SUPPORTED = "Not supported."; - - static public string IDS_CHATON_BODY_AVAILABLE = "Available"; - - static public string IDS_CHATON_HEADER_CONNECTION_FAILED_ABB2 = "Connection failed"; - - static public string IDS_WIFI_SK2_CANCEL_CONNECTION = "Cancel connection"; - - static public string IDS_ST_HEADER_CONNECTED_DEVICES = "Connected devices"; - - static public string IDS_WIFI_BODY_SELECT_ALL = "Select all"; - - static public string IDS_ST_HEADER_BUSY_DEVICES = "Busy devices"; - - static public string IDS_ST_BODY_CONNECTED_WITH_ANOTHER_DEVICE_ABB = "Connected with another device"; - - static public string IDS_WIFI_BODY_WAITING_FOR_CONNECTION_M_STATUS_ABB = "Waiting for connection"; - - static public string IDS_WIFI_BUTTON_MULTI_CONNECT = "Multi connect"; - - static public string IDS_WIFI_SK_DISCONNECT = "Disconnect"; - - static public string IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE = "Disable Wi-Fi Direct after use"; - - static public string IDS_WIFI_BODY_DISABLE_WI_FI_DIRECT_AFTER_USE_ABB = "Disable Wi-Fi Direct after use"; - - static public string IDS_WIFI_BODY_PS_IS_REQUESTING_A_WI_FI_DIRECT_CONNECTION_ALLOW_Q = - "%s is requesting a Wi-Fi Direct connection. Allow?"; - - static public string IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_CONNECTION_CONTINUE_Q = - "Using Wi-Fi Direct will disconnect current Wi-Fi connection. Continue?"; - - static public string IDS_WIFI_BODY_USING_WI_FI_DIRECT_WILL_DISCONNECT_CURRENT_WI_FI_TETHERING_CONTINUE_Q = - "Using Wi-Fi Direct will disconnect current Wi-Fi tethering. Continue?"; - - static public string IDS_WIFI_HEADER_WI_FI_DIRECT_CONNECTION_ABB = "Wi-Fi Direct connection"; - - static public string IDS_WIFI_POP_THERE_HAS_BEEN_NO_ACTIVITY_FOR_PD_MINUTES_SINCE_WI_FI_DIRECT_WAS_ENABLED_MSG = - "There has been no activity for %d minutes since Wi-Fi Direct was enabled. To extend battery life, Wi-Fi Direct has been disabled."; - - static public string IDS_WIFI_SK4_SCAN = "Scan"; - - static public string IDS_WIFI_SK_STOP = "Stop"; - - static public string IDS_WIFI_POP_DEACTIVATION_FAILED = "Deactivation failed."; - - static public string IDS_WIFI_POP_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_CONTINUE_Q = "Current connection will be disconnected. Continue?"; - - static public string IDS_ST_POP_YOU_CAN_CONNECT_UP_TO_PD_DEVICES_AT_THE_SAME_TIME = "You can connect up to %d devices at the same time."; - - static public string IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB = "Available devices"; - - static public string IDS_WIFI_POP_FAILED_TO_CONNECT_TO_PS = "Failed to connect to %s."; - - static public string IDS_ST_POP_DEVICE_CONNECTED_TO_ANOTHER_DEVICE = "Device connected to another device."; - - static public string IDS_WIFI_BODY_CONNECTED_TO_PS = "Connected to %s."; - - static public string IDS_COM_BODY_PINS_DO_NOT_MATCH = "PINs do not match."; - - static public string IDS_WIFI_BODY_CURRENT_CONNECTION_WILL_BE_DISCONNECTED_SO_THAT_SCANNING_CAN_START_CONTINUE_Q = - "Current connection will be disconnected so that scanning can start. Continue?"; - - static public string IDS_WIFI_POP_ENTER_PIN_TO_CONNECT_TO_PS = "Enter PIN to connect to %s."; - - static public string IDS_WIFI_POP_CONNECT_TO_PS_IN_PD_SECONDS = "Connect to %s in %d seconds."; - - static public string IDS_WIFI_POP_PIN_CODE_PS = "PIN %s"; - - static public string IDS_DLNA_HEADER_SELECT_DEVICES_ABB = "Select devices"; - - static public string IDS_WIFI_BODY_THE_WI_FI_DIRECT_CONNECTION_HAS_BEEN_LOST = "The Wi-Fi Direct connection has been lost."; - - static public string IDS_ST_BODY_CONNECT_WITH_PS_IN_PD_SECS_ABB = "Connect with %s in %d secs."; - - static public string IDS_ST_BODY_RENAME_DEVICE_ABB = "Rename device"; - - static public string IDS_WIFI_POP_PIN = "PIN"; - - static public string IDS_WIFI_HEADER_UNABLE_TO_CONNECT_ABB2 = "Unable to connect"; - - static public string IDS_WIFI_BUTTON_ALLOW = "Allow"; - - static public string IDS_WIFI_SK_CONNECT = "Connect"; - - static public string IDS_WIFI_BODY_CONNECTED = "Connected."; - - static public string IDS_STU_HEADER_ENTER_DEVICE_NAME = "Enter device name"; - - static public string IDS_WIFI_SBODY_NOT_CONNECTED_M_STATUS_ABB = "Not connected"; - - static public string IDS_WIFI_POP_THIS_WI_FI_DIRECT_CONNECTION_WILL_BE_CANCELLED = "This Wi-Fi Direct connection will be cancelled."; - - static public string IDS_WIFI_BODY_TO_SAVE_BATTERY_POWER_DISABLE_WI_FI_DIRECT_AFTER_USE = - "To save battery power, disable Wi-Fi Direct after use."; - - static public string IDS_SMR_BODY_SCREEN_MIRRORING_IS_ENABLED = "Screen Mirroring is enabled."; - - static public string IDS_SMR_POP_SCREEN_MIRRORING_HAS_BEEN_DISABLED = "Screen Mirroring has been disabled."; - - static public string IDS_WIFI_BODY_YOUR_DEVICE_HPS_IS_CURRENTLY_VISIBLE_TO_NEARBY_DEVICES = - "Your device ({0}) is currently visible to nearby devices."; - } -} diff --git a/SettingWiFiDirect/SettingWiFiDirect/view/WiFiDirectDeviceView.cs b/SettingWiFiDirect/SettingWiFiDirect/view/WiFiDirectDeviceView.cs index 94e4088..a943409 100644 --- a/SettingWiFiDirect/SettingWiFiDirect/view/WiFiDirectDeviceView.cs +++ b/SettingWiFiDirect/SettingWiFiDirect/view/WiFiDirectDeviceView.cs @@ -1,6 +1,8 @@ +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel; +using SettingWiFiDirect.TextResources; using static SettingWiFiDirect.Logger; namespace SettingWiFiDirect @@ -64,7 +66,11 @@ namespace SettingWiFiDirect public PeerSource() { Debug("+"); - mAvailable = new DeviceCollection(Resources.IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB); + + var availableGroupTitle = ResourceManager.TextResourceManager.NUIGadgetResourceManager.GetString( + nameof(Resources.IDS_WIFI_HEADER_AVAILABLE_DEVICES_ABB)); + + mAvailable = new DeviceCollection(availableGroupTitle); this.Add(mAvailable); } diff --git a/packaging/org.tizen.cssetting-wifi-direct-1.0.2.rpk b/packaging/org.tizen.cssetting-wifi-direct-1.0.2.rpk deleted file mode 100644 index e261a51..0000000 Binary files a/packaging/org.tizen.cssetting-wifi-direct-1.0.2.rpk and /dev/null differ diff --git a/packaging/org.tizen.cssetting-wifi-direct-1.0.3.rpk b/packaging/org.tizen.cssetting-wifi-direct-1.0.3.rpk new file mode 100644 index 0000000..29caf91 Binary files /dev/null and b/packaging/org.tizen.cssetting-wifi-direct-1.0.3.rpk differ diff --git a/packaging/org.tizen.setting-wifi-direct.spec b/packaging/org.tizen.setting-wifi-direct.spec index a63a03c..eed40b2 100644 --- a/packaging/org.tizen.setting-wifi-direct.spec +++ b/packaging/org.tizen.setting-wifi-direct.spec @@ -1,6 +1,6 @@ Name: org.tizen.setting-wifi-direct summary: NUI wifi-direct setting application -Version: 1.0.2 +Version: 1.0.3 Release: 1 Provides: org.tizen.setting-wifi-direct = %{version}-%{release} Group: Applications/Security