localization commands localized :OOOO localiception!
This commit is contained in:
		@@ -7,7 +7,6 @@ using System.Collections.Generic;
 | 
				
			|||||||
using System.Collections.Immutable;
 | 
					using System.Collections.Immutable;
 | 
				
			||||||
using System.Globalization;
 | 
					using System.Globalization;
 | 
				
			||||||
using System.Linq;
 | 
					using System.Linq;
 | 
				
			||||||
using System.Text;
 | 
					 | 
				
			||||||
using System.Threading.Tasks;
 | 
					using System.Threading.Tasks;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace NadekoBot.Modules.Administration
 | 
					namespace NadekoBot.Modules.Administration
 | 
				
			||||||
@@ -17,7 +16,7 @@ namespace NadekoBot.Modules.Administration
 | 
				
			|||||||
        [Group]
 | 
					        [Group]
 | 
				
			||||||
        public class LocalizationCommands : NadekoSubmodule
 | 
					        public class LocalizationCommands : NadekoSubmodule
 | 
				
			||||||
        {
 | 
					        {
 | 
				
			||||||
            private ImmutableDictionary<string, string> SupportedLocales { get; } = new Dictionary<string, string>()
 | 
					            private ImmutableDictionary<string, string> supportedLocales { get; } = new Dictionary<string, string>()
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                {"en-US", "English, United States" },
 | 
					                {"en-US", "English, United States" },
 | 
				
			||||||
                {"sr-cyrl-rs", "Serbian, Cyrillic" }
 | 
					                {"sr-cyrl-rs", "Serbian, Cyrillic" }
 | 
				
			||||||
@@ -28,7 +27,8 @@ namespace NadekoBot.Modules.Administration
 | 
				
			|||||||
            public async Task LanguageSet()
 | 
					            public async Task LanguageSet()
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                var cul = NadekoBot.Localization.GetCultureInfo(Context.Guild);
 | 
					                var cul = NadekoBot.Localization.GetCultureInfo(Context.Guild);
 | 
				
			||||||
                await Context.Channel.SendConfirmAsync("This server's language is set to " + Format.Bold(cul.ToString()) + " - " + Format.Bold(cul.NativeName)).ConfigureAwait(false);
 | 
					                await ReplyConfirmLocalized("lang_set_show", Format.Bold(cul.ToString()), Format.Bold(cul.NativeName))
 | 
				
			||||||
 | 
					                    .ConfigureAwait(false);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            [NadekoCommand, Usage, Description, Aliases]
 | 
					            [NadekoCommand, Usage, Description, Aliases]
 | 
				
			||||||
@@ -36,9 +36,9 @@ namespace NadekoBot.Modules.Administration
 | 
				
			|||||||
            [RequireUserPermission(GuildPermission.Administrator)]
 | 
					            [RequireUserPermission(GuildPermission.Administrator)]
 | 
				
			||||||
            public async Task LanguageSet(string name)
 | 
					            public async Task LanguageSet(string name)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                CultureInfo ci = null;
 | 
					 | 
				
			||||||
                try
 | 
					                try
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
 | 
					                    CultureInfo ci;
 | 
				
			||||||
                    if (name.Trim().ToLowerInvariant() == "default")
 | 
					                    if (name.Trim().ToLowerInvariant() == "default")
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        NadekoBot.Localization.RemoveGuildCulture(Context.Guild);
 | 
					                        NadekoBot.Localization.RemoveGuildCulture(Context.Guild);
 | 
				
			||||||
@@ -50,12 +50,11 @@ namespace NadekoBot.Modules.Administration
 | 
				
			|||||||
                        NadekoBot.Localization.SetGuildCulture(Context.Guild, ci);
 | 
					                        NadekoBot.Localization.SetGuildCulture(Context.Guild, ci);
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                    await Context.Channel.SendConfirmAsync($"Your server's locale is now {Format.Bold(ci.ToString())} - {Format.Bold(ci.NativeName)}.").ConfigureAwait(false);
 | 
					                    await ReplyConfirmLocalized("lang_set", Format.Bold(ci.ToString()), Format.Bold(ci.NativeName)).ConfigureAwait(false);
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                catch(Exception) {
 | 
					                catch(Exception)
 | 
				
			||||||
 | 
					                {
 | 
				
			||||||
                    //_log.warn(ex);
 | 
					                    await ReplyErrorLocalized("lang_set_fail").ConfigureAwait(false);
 | 
				
			||||||
                    await Context.Channel.SendConfirmAsync($"Failed setting locale. Revisit this command's help.").ConfigureAwait(false);
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -63,17 +62,16 @@ namespace NadekoBot.Modules.Administration
 | 
				
			|||||||
            public async Task LanguageSetDefault()
 | 
					            public async Task LanguageSetDefault()
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                var cul = NadekoBot.Localization.DefaultCultureInfo;
 | 
					                var cul = NadekoBot.Localization.DefaultCultureInfo;
 | 
				
			||||||
                await Context.Channel.SendConfirmAsync("Bot's language is set to " + cul + " - " + cul.NativeName).ConfigureAwait(false);
 | 
					                await ReplyConfirmLocalized("lang_set_bot_show", cul, cul.NativeName).ConfigureAwait(false);
 | 
				
			||||||
                return;
 | 
					 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            [NadekoCommand, Usage, Description, Aliases]
 | 
					            [NadekoCommand, Usage, Description, Aliases]
 | 
				
			||||||
            [OwnerOnly]
 | 
					            [OwnerOnly]
 | 
				
			||||||
            public async Task LanguageSetDefault(string name)
 | 
					            public async Task LanguageSetDefault(string name)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                CultureInfo ci = null;
 | 
					 | 
				
			||||||
                try
 | 
					                try
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
 | 
					                    CultureInfo ci;
 | 
				
			||||||
                    if (name.Trim().ToLowerInvariant() == "default")
 | 
					                    if (name.Trim().ToLowerInvariant() == "default")
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        NadekoBot.Localization.ResetDefaultCulture();
 | 
					                        NadekoBot.Localization.ResetDefaultCulture();
 | 
				
			||||||
@@ -84,22 +82,21 @@ namespace NadekoBot.Modules.Administration
 | 
				
			|||||||
                        ci = new CultureInfo(name);
 | 
					                        ci = new CultureInfo(name);
 | 
				
			||||||
                        NadekoBot.Localization.SetDefaultCulture(ci);
 | 
					                        NadekoBot.Localization.SetDefaultCulture(ci);
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
 | 
					                    await ReplyConfirmLocalized("lang_set_bot", Format.Bold(ci.ToString()), Format.Bold(ci.NativeName)).ConfigureAwait(false);
 | 
				
			||||||
                    await Context.Channel.SendConfirmAsync($"Bot's default locale is now {Format.Bold(ci.ToString())} - {Format.Bold(ci.NativeName)}.").ConfigureAwait(false);
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                catch (Exception)
 | 
					                catch (Exception)
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    //_log.warn(ex);
 | 
					                    await ReplyErrorLocalized("lang_set_fail").ConfigureAwait(false);
 | 
				
			||||||
                    await Context.Channel.SendConfirmAsync($"Failed setting locale. Revisit this command's help.").ConfigureAwait(false);
 | 
					 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            [NadekoCommand, Usage, Description, Aliases]
 | 
					            [NadekoCommand, Usage, Description, Aliases]
 | 
				
			||||||
            [OwnerOnly]
 | 
					            [OwnerOnly]
 | 
				
			||||||
            public async Task LanguagesList(string name)
 | 
					            public async Task LanguagesList()
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                await Context.Channel.SendConfirmAsync("List Of Languages",
 | 
					                await ReplyConfirmLocalized("lang_list",
 | 
				
			||||||
                    string.Join("\n", SupportedLocales.Select(x => $"{Format.Code(x.Key)} => {x.Value}")));
 | 
					                        string.Join("\n", supportedLocales.Select(x => $"{Format.Code(x.Key)} => {x.Value}")))
 | 
				
			||||||
 | 
					                    .ConfigureAwait(false);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										55
									
								
								src/NadekoBot/Resources/ResponseStrings.Designer.cs
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										55
									
								
								src/NadekoBot/Resources/ResponseStrings.Designer.cs
									
									
									
										generated
									
									
									
								
							@@ -122,6 +122,61 @@ namespace NadekoBot.Resources {
 | 
				
			|||||||
            }
 | 
					            }
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        ///    Looks up a localized string similar to List Of Languages
 | 
				
			||||||
 | 
					        ///{0}.
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        public static string administration_lang_list {
 | 
				
			||||||
 | 
					            get {
 | 
				
			||||||
 | 
					                return ResourceManager.GetString("administration_lang_list", resourceCulture);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        ///    Looks up a localized string similar to Your server's locale is now {0} - {1}.
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        public static string administration_lang_set {
 | 
				
			||||||
 | 
					            get {
 | 
				
			||||||
 | 
					                return ResourceManager.GetString("administration_lang_set", resourceCulture);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        ///    Looks up a localized string similar to Bot's default locale is now {0} - {1}.
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        public static string administration_lang_set_bot {
 | 
				
			||||||
 | 
					            get {
 | 
				
			||||||
 | 
					                return ResourceManager.GetString("administration_lang_set_bot", resourceCulture);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        ///    Looks up a localized string similar to Bot's language is set to {0} - {0}.
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        public static string administration_lang_set_bot_show {
 | 
				
			||||||
 | 
					            get {
 | 
				
			||||||
 | 
					                return ResourceManager.GetString("administration_lang_set_bot_show", resourceCulture);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        ///    Looks up a localized string similar to Failed setting locale. Revisit this command's help..
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        public static string administration_lang_set_fail {
 | 
				
			||||||
 | 
					            get {
 | 
				
			||||||
 | 
					                return ResourceManager.GetString("administration_lang_set_fail", resourceCulture);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
 | 
					        /// <summary>
 | 
				
			||||||
 | 
					        ///    Looks up a localized string similar to This server's language is set to {0} - {0}.
 | 
				
			||||||
 | 
					        /// </summary>
 | 
				
			||||||
 | 
					        public static string administration_lang_set_show {
 | 
				
			||||||
 | 
					            get {
 | 
				
			||||||
 | 
					                return ResourceManager.GetString("administration_lang_set_show", resourceCulture);
 | 
				
			||||||
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
        /// <summary>
 | 
					        /// <summary>
 | 
				
			||||||
        ///    Looks up a localized string similar to I don't have the permission necessary for that most likely..
 | 
					        ///    Looks up a localized string similar to I don't have the permission necessary for that most likely..
 | 
				
			||||||
        /// </summary>
 | 
					        /// </summary>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -304,6 +304,40 @@
 | 
				
			|||||||
  <data name="administration_aar_enabled" xml:space="preserve">
 | 
					  <data name="administration_aar_enabled" xml:space="preserve">
 | 
				
			||||||
    <value>**Auto assign role** on user join is now **enabled**.</value>
 | 
					    <value>**Auto assign role** on user join is now **enabled**.</value>
 | 
				
			||||||
  </data>
 | 
					  </data>
 | 
				
			||||||
 | 
					  <data name="administration_dm_from" xml:space="preserve">
 | 
				
			||||||
 | 
					    <value>DM from</value>
 | 
				
			||||||
 | 
					  </data>
 | 
				
			||||||
 | 
					  <data name="administration_fwall_start" xml:space="preserve">
 | 
				
			||||||
 | 
					    <value>I will forward DMs to all owners.</value>
 | 
				
			||||||
 | 
					  </data>
 | 
				
			||||||
 | 
					  <data name="administration_fwall_stop" xml:space="preserve">
 | 
				
			||||||
 | 
					    <value>I will forward DMs only to the first owner.</value>
 | 
				
			||||||
 | 
					  </data>
 | 
				
			||||||
 | 
					  <data name="administration_fwdm_start" xml:space="preserve">
 | 
				
			||||||
 | 
					    <value>I will forward DMs from now on.</value>
 | 
				
			||||||
 | 
					  </data>
 | 
				
			||||||
 | 
					  <data name="administration_fwdm_stop" xml:space="preserve">
 | 
				
			||||||
 | 
					    <value>I will stop forwarding DMs from now on.</value>
 | 
				
			||||||
 | 
					  </data>
 | 
				
			||||||
 | 
					  <data name="administration_lang_list" xml:space="preserve">
 | 
				
			||||||
 | 
					    <value>List Of Languages
 | 
				
			||||||
 | 
					{0}</value>
 | 
				
			||||||
 | 
					  </data>
 | 
				
			||||||
 | 
					  <data name="administration_lang_set" xml:space="preserve">
 | 
				
			||||||
 | 
					    <value>Your server's locale is now {0} - {1}</value>
 | 
				
			||||||
 | 
					  </data>
 | 
				
			||||||
 | 
					  <data name="administration_lang_set_bot" xml:space="preserve">
 | 
				
			||||||
 | 
					    <value>Bot's default locale is now {0} - {1}</value>
 | 
				
			||||||
 | 
					  </data>
 | 
				
			||||||
 | 
					  <data name="administration_lang_set_bot_show" xml:space="preserve">
 | 
				
			||||||
 | 
					    <value>Bot's language is set to {0} - {0}</value>
 | 
				
			||||||
 | 
					  </data>
 | 
				
			||||||
 | 
					  <data name="administration_lang_set_fail" xml:space="preserve">
 | 
				
			||||||
 | 
					    <value>Failed setting locale. Revisit this command's help.</value>
 | 
				
			||||||
 | 
					  </data>
 | 
				
			||||||
 | 
					  <data name="administration_lang_set_show" xml:space="preserve">
 | 
				
			||||||
 | 
					    <value>This server's language is set to {0} - {0}</value>
 | 
				
			||||||
 | 
					  </data>
 | 
				
			||||||
  <data name="administration_mute_error" xml:space="preserve">
 | 
					  <data name="administration_mute_error" xml:space="preserve">
 | 
				
			||||||
    <value>I don't have the permission necessary for that most likely.</value>
 | 
					    <value>I don't have the permission necessary for that most likely.</value>
 | 
				
			||||||
  </data>
 | 
					  </data>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user