Browse Source

string fix

Tigran 3 years ago
parent
commit
01af8798a0

+ 2 - 2
CardCollector.sln.DotSettings.user

@@ -17,9 +17,9 @@
 	
 	
 	
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FMessages/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FMessages/@EntryIndexedValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FSortingTypes/@EntryIndexedValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FText/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FResources_002FText/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/CheckedGroups/=CardCollector_002FStickerEffects_002FEffectTranslations/@EntryIndexedValue">False</s:Boolean>
 	
 	<s:Boolean x:Key="/Default/ResxEditorPersonal/Initialized/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>

+ 2 - 1
CardCollector/Commands/CallbackQuery/BuyShopItem.cs

@@ -46,10 +46,11 @@ namespace CardCollector.Commands.CallbackQuery
                 if (offerSpecial && !offerInfinite)
                     await SpecialOfferUsersDao.AddNew(User.Id, module.SelectedPosition.Id);
                 var packId = module.SelectedPosition?.PackId ?? module.SelectedPack?.Id ?? 1;
+                var packInfo = await PacksDao.GetById(packId);
                 var userPack = await UserPacksDao.GetOne(User.Id, packId);
                 userPack.Count += module.SelectedPosition?.Count ?? module.Count;
                 if (module.SelectedPosition?.AdditionalPrize != "") await GivePrize(module.SelectedPosition?.AdditionalPrize);
-                await MessageController.EditMessage(User, $"{Messages.thanks_for_buying} {userPack.Count}", 
+                await MessageController.EditMessage(User, $"{Messages.thanks_for_buying} {userPack.Count} {Text.packs} {packInfo.Author}", 
                     offerSpecial && !offerInfinite || (module.SelectedPosition?.Expired ?? false) || !canBuy
                     ? Keyboard.BackKeyboard
                     : Keyboard.RepeatCommand(Text.buy_more, CallbackData));

+ 9 - 0
CardCollector/Resources/Text.Designer.cs

@@ -609,6 +609,15 @@ namespace CardCollector.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to паков.
+        /// </summary>
+        internal static string packs {
+            get {
+                return ResourceManager.GetString("packs", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to за.
         /// </summary>

+ 3 - 0
CardCollector/Resources/Text.resx

@@ -300,4 +300,7 @@
     <data name="daily_exp_top" xml:space="preserve">
         <value>Топ игроков по опыту</value>
     </data>
+    <data name="packs" xml:space="preserve">
+        <value>паков</value>
+    </data>
 </root>