String fix, bug fix

CardCollector/Commands/CallbackQuery/CountQuery.cs

@@ -23,12 +23,12 @@ namespace CardCollector.Commands.CallbackQuery
                 _ => (0, 0)
             };
             var changed = false;
-            if (CallbackData.Contains('+') && (stickerCount < maxCount || maxCount == -1))
+            if (CallbackData.Contains(Text.minus) && (stickerCount < maxCount || maxCount == -1))
             {
                 stickerCount++;
                 changed = true;
             }
-            else if (CallbackData.Contains('-') && stickerCount > 1)
+            else if (CallbackData.Contains(Text.plus) && stickerCount > 1)
             {
                 stickerCount--;
                 changed = true;

CardCollector/Resources/Keyboard.cs

@@ -270,8 +270,8 @@ namespace CardCollector.Resources
                 new[] {InlineKeyboardButton.WithCallbackData($"{Text.sell_on_auction} ({count})", Command.sell_on_auction)},
                 new[]
                 {
-                    InlineKeyboardButton.WithCallbackData(Text.minus, $"{Command.count}-"),
-                    InlineKeyboardButton.WithCallbackData(Text.plus, $"{Command.count}+"),
+                    InlineKeyboardButton.WithCallbackData(Text.minus, $"{Command.count}={Text.minus}"),
+                    InlineKeyboardButton.WithCallbackData(Text.plus, $"{Command.count}={Text.plus}"),
                 }
             };
             if (sticker.Tier != 4) keyboard.Add(new[] {InlineKeyboardButton.WithCallbackData($"{Text.combine} ({count})", Command.combine)});
@@ -294,8 +294,8 @@ namespace CardCollector.Resources
                 new[] {InlineKeyboardButton.WithCallbackData($"{Text.buy} ({module.Count}) {price}{Text.gem}", Command.confirm_buying)},
                 new[]
                 {
-                    InlineKeyboardButton.WithCallbackData(Text.minus, $"{Command.count}-"),
-                    InlineKeyboardButton.WithCallbackData(Text.plus, $"{Command.count}+"),
+                    InlineKeyboardButton.WithCallbackData(Text.minus, $"{Command.count}={Text.minus}"),
+                    InlineKeyboardButton.WithCallbackData(Text.plus, $"{Command.count}={Text.plus}"),
                 },
                 new[] {InlineKeyboardButton.WithCallbackData(Text.back, $"{Command.back}={Command.clear_chat}")},
             });
@@ -338,8 +338,8 @@ namespace CardCollector.Resources
                 new[] {InlineKeyboardButton.WithCallbackData($"{Text.add} ({module.Count})", Command.combine)},
                 new[]
                 {
-                    InlineKeyboardButton.WithCallbackData(Text.minus, $"{Command.count}-"),
-                    InlineKeyboardButton.WithCallbackData(Text.plus, $"{Command.count}+"),
+                    InlineKeyboardButton.WithCallbackData(Text.minus, $"{Command.count}={Text.minus}"),
+                    InlineKeyboardButton.WithCallbackData(Text.plus, $"{Command.count}={Text.plus}"),
                 },
                 new[] {InlineKeyboardButton.WithCallbackData(Text.cancel, Command.back_to_combine)},
                 new[] {InlineKeyboardButton.WithSwitchInlineQueryCurrentChat(Text.select_another)},

CardCollector/Resources/Text.Designer.cs

@@ -322,7 +322,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to После покупки вы получите 50 алмазов на свой счет. Вы также можете оставить чаевые. Вы получите алмазы в рассчете $1 за 50💎.
+        ///   Looks up a localized string similar to После покупки вы получите 50 алмазов на свой счет. Вы также можете оставить чаевые. Вы получите алмазы в рассчете 50💎 за $1.
         /// </summary>
         internal static string gems_description {
             get {
@@ -331,43 +331,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 100💎.
-        /// </summary>
-        internal static string gems_label100 {
-            get {
-                return ResourceManager.GetString("gems_label100", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 1000💎.
-        /// </summary>
-        internal static string gems_label1000 {
-            get {
-                return ResourceManager.GetString("gems_label1000", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 250💎.
-        /// </summary>
-        internal static string gems_label250 {
-            get {
-                return ResourceManager.GetString("gems_label250", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 2500💎.
-        /// </summary>
-        internal static string gems_label2500 {
-            get {
-                return ResourceManager.GetString("gems_label2500", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 50💎.
+        ///   Looks up a localized string similar to 50💎 за $1.
         /// </summary>
         internal static string gems_label50 {
             get {
@@ -376,16 +340,7 @@ namespace CardCollector.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to 500💎.
-        /// </summary>
-        internal static string gems_label500 {
-            get {
-                return ResourceManager.GetString("gems_label500", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to 50 алмазов.
+        ///   Looks up a localized string similar to 50💎 за $1.
         /// </summary>
         internal static string gems_title {
             get {

CardCollector/Resources/Text.resx

@@ -214,13 +214,13 @@
         <value>Информация</value>
     </data>
     <data name="gems_title" xml:space="preserve">
-        <value>50 алмазов</value>
+        <value>50💎 за $1</value>
     </data>
     <data name="gems_description" xml:space="preserve">
-        <value>После покупки вы получите 50 алмазов на свой счет. Вы также можете оставить чаевые. Вы получите алмазы в рассчете $1 за 50💎</value>
+        <value>После покупки вы получите 50 алмазов на свой счет. Вы также можете оставить чаевые. Вы получите алмазы в рассчете 50💎 за $1</value>
     </data>
     <data name="gems_label50" xml:space="preserve">
-        <value>50💎</value>
+        <value>50💎 за $1</value>
     </data>
     <data name="open_specific" xml:space="preserve">
         <value>Открыть авторский пак</value>
@@ -228,19 +228,4 @@
     <data name="effect" xml:space="preserve">
         <value>Эффект</value>
     </data>
-    <data name="gems_label100" xml:space="preserve">
-        <value>100💎</value>
-    </data>
-    <data name="gems_label250" xml:space="preserve">
-        <value>250💎</value>
-    </data>
-    <data name="gems_label500" xml:space="preserve">
-        <value>500💎</value>
-    </data>
-    <data name="gems_label1000" xml:space="preserve">
-        <value>1000💎</value>
-    </data>
-    <data name="gems_label2500" xml:space="preserve">
-        <value>2500💎</value>
-    </data>
 </root>