Added more language parameters.

babelshift · babelshift · commit 0edf85c7027b · 2016-03-15T13:01:48.000-04:00
diff --git a/SteamWebAPI2.Net451/SteamWebAPI2.Net451.csproj b/SteamWebAPI2.Net451/SteamWebAPI2.Net451.csproj
@@ -39,8 +39,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Steam.Models, Version=1.0.0.28, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Steam.Models.1.0.0.28\lib\net451\Steam.Models.dll</HintPath>
+    <Reference Include="Steam.Models, Version=1.0.0.30, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Steam.Models.1.0.0.30\lib\net451\Steam.Models.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/SteamWebAPI2.Net451/packages.config b/SteamWebAPI2.Net451/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="AutoMapper" version="4.2.1" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net451" />
-  <package id="Steam.Models" version="1.0.0.29" targetFramework="net451" />
+  <package id="Steam.Models" version="1.0.0.30" targetFramework="net451" />
 </packages>
diff --git a/SteamWebAPI2.Net452/SteamWebAPI2.Net452.csproj b/SteamWebAPI2.Net452/SteamWebAPI2.Net452.csproj
@@ -39,8 +39,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Steam.Models, Version=1.0.0.28, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Steam.Models.1.0.0.28\lib\net452\Steam.Models.dll</HintPath>
+    <Reference Include="Steam.Models, Version=1.0.0.30, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Steam.Models.1.0.0.30\lib\net452\Steam.Models.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/SteamWebAPI2.Net452/packages.config b/SteamWebAPI2.Net452/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="AutoMapper" version="4.2.1" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net452" />
-  <package id="Steam.Models" version="1.0.0.29" targetFramework="net452" />
+  <package id="Steam.Models" version="1.0.0.30" targetFramework="net452" />
 </packages>
diff --git a/SteamWebAPI2.Portable/project.json b/SteamWebAPI2.Portable/project.json
@@ -8,7 +8,7 @@
     "Microsoft.NETCore": "5.0.0",
     "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
     "Newtonsoft.Json": "8.0.3",
-    "Steam.Models": "1.0.0.29"
+    "Steam.Models": "1.0.0.30"
   },
   "frameworks": {
     "dotnet": {
diff --git a/SteamWebAPI2/Interfaces/DOTA2Econ.cs b/SteamWebAPI2/Interfaces/DOTA2Econ.cs
@@ -138,7 +138,7 @@ public async Task<string> GetItemIconPathAsync(string iconName, string iconType
         /// </summary>
         /// <param name="language"></param>
         /// <returns></returns>
-        public async Task<IReadOnlyCollection<RarityModel>> GetRaritiesAsync(string language = "")
+        public async Task<IReadOnlyCollection<RarityModel>> GetRaritiesAsync(string language = "en_us")
         {
             List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();
 
diff --git a/SteamWebAPI2/Interfaces/EconItems.cs b/SteamWebAPI2/Interfaces/EconItems.cs
@@ -71,7 +71,7 @@ public async Task<EconItemResultModel> GetPlayerItemsAsync(long steamId)
             return econItemResultModel;
         }
 
-        public async Task<SchemaModel> GetSchemaAsync(string language = "")
+        public async Task<SchemaModel> GetSchemaAsync(string language = "en_us")
         {
             if (!validSchemaAppIds.Contains(appId))
             {
diff --git a/SteamWebAPI2/Interfaces/ISteamEconomy.cs b/SteamWebAPI2/Interfaces/ISteamEconomy.cs
@@ -7,7 +7,7 @@ namespace SteamWebAPI2.Interfaces
 {
     public interface ISteamEconomy
     {
-        Task<AssetClassInfoResultModel> GetAssetClassInfoAsync(int appId, IReadOnlyList<long> classIds);
-        Task<AssetPriceResultModel> GetAssetPricesAsync(int appId, string currency = "", string language = "");
+        Task<AssetClassInfoResultModel> GetAssetClassInfoAsync(int appId, IReadOnlyList<long> classIds, string language);
+        Task<AssetPriceResultModel> GetAssetPricesAsync(int appId, string currency, string language);
     }
 }
diff --git a/SteamWebAPI2/Interfaces/SteamEconomy.cs b/SteamWebAPI2/Interfaces/SteamEconomy.cs
@@ -14,11 +14,12 @@ public SteamEconomy(string steamWebApiKey)
         {
         }
 
-        public async Task<AssetClassInfoResultModel> GetAssetClassInfoAsync(int appId, IReadOnlyList<long> classIds)
+        public async Task<AssetClassInfoResultModel> GetAssetClassInfoAsync(int appId, IReadOnlyList<long> classIds, string language = "en_us")
         {
             List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();
 
             parameters.AddIfHasValue(appId, "appid");
+            parameters.AddIfHasValue(language, "language");
             parameters.AddIfHasValue(classIds.Count, "class_count");
 
             for (int i = 0; i < classIds.Count; i++)
@@ -33,7 +34,7 @@ public async Task<AssetClassInfoResultModel> GetAssetClassInfoAsync(int appId, I
             return assetClassInfoResultModel;
         }
 
-        public async Task<AssetPriceResultModel> GetAssetPricesAsync(int appId, string currency = "", string language = "")
+        public async Task<AssetPriceResultModel> GetAssetPricesAsync(int appId, string currency = "", string language = "en_us")
         {
             List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();
 
diff --git a/SteamWebAPI2/Interfaces/SteamUserStats.cs b/SteamWebAPI2/Interfaces/SteamUserStats.cs
@@ -70,7 +70,7 @@ public async Task<int> GetNumberOfCurrentPlayersForGameAsync(int appId)
             return globalStatsResult.Result.PlayerCount;
         }
 
-        public async Task<PlayerAchievementResultModel> GetPlayerAchievementsAsync(int appId, long steamId, string language = "")
+        public async Task<PlayerAchievementResultModel> GetPlayerAchievementsAsync(int appId, long steamId, string language = "en_us")
         {
             List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();
             parameters.AddIfHasValue(appId, "appid");
diff --git a/SteamWebAPI2/Models/DOTA2/RarityResultContainer.cs b/SteamWebAPI2/Models/DOTA2/RarityResultContainer.cs
@@ -8,6 +8,7 @@ internal class Rarity
         public int Id { get; set; }
         public int Order { get; set; }
         public string Color { get; set; }
+        public string LocalizedName { get; set; }
     }
 
     internal class RarityResult
diff --git a/SteamWebAPI2/Models/SteamPlayer/PlayerAchievementResultContainer.cs b/SteamWebAPI2/Models/SteamPlayer/PlayerAchievementResultContainer.cs
@@ -10,6 +10,9 @@ internal class PlayerAchievement
 
         [JsonProperty("achieved")]
         public int Achieved { get; set; }
+
+        public string Name { get; set; }
+        public string Description { get; set; }
     }
 
     internal class PlayerAchievementResult
diff --git a/SteamWebAPI2/SteamWebAPI2.csproj b/SteamWebAPI2/SteamWebAPI2.csproj
@@ -38,8 +38,8 @@
       <HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Steam.Models, Version=1.0.0.28, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Steam.Models.1.0.0.28\lib\net46\Steam.Models.dll</HintPath>
+    <Reference Include="Steam.Models, Version=1.0.0.30, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Steam.Models.1.0.0.30\lib\net46\Steam.Models.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/SteamWebAPI2/packages.config b/SteamWebAPI2/packages.config
@@ -2,5 +2,5 @@
 <packages>
   <package id="AutoMapper" version="4.2.1" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
-  <package id="Steam.Models" version="1.0.0.29" targetFramework="net46" />
+  <package id="Steam.Models" version="1.0.0.30" targetFramework="net46" />
 </packages>

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public async Task<string> GetItemIconPathAsync(string iconName, string iconType`
`138`	`138`	`/// </summary>`
`139`	`139`	`/// <param name="language"></param>`
`140`	`140`	`/// <returns></returns>`
`141`		`- public async Task<IReadOnlyCollection<RarityModel>> GetRaritiesAsync(string language = "")`
	`141`	`+ public async Task<IReadOnlyCollection<RarityModel>> GetRaritiesAsync(string language = "en_us")`
`142`	`142`	`{`
`143`	`143`	`List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();`
`144`	`144`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public async Task<EconItemResultModel> GetPlayerItemsAsync(long steamId)`
`71`	`71`	`return econItemResultModel;`
`72`	`72`	`}`
`73`	`73`
`74`		`- public async Task<SchemaModel> GetSchemaAsync(string language = "")`
	`74`	`+ public async Task<SchemaModel> GetSchemaAsync(string language = "en_us")`
`75`	`75`	`{`
`76`	`76`	`if (!validSchemaAppIds.Contains(appId))`
`77`	`77`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace SteamWebAPI2.Interfaces`
`7`	`7`	`{`
`8`	`8`	`public interface ISteamEconomy`
`9`	`9`	`{`
`10`		`- Task<AssetClassInfoResultModel> GetAssetClassInfoAsync(int appId, IReadOnlyList<long> classIds);`
`11`		`- Task<AssetPriceResultModel> GetAssetPricesAsync(int appId, string currency = "", string language = "");`
	`10`	`+ Task<AssetClassInfoResultModel> GetAssetClassInfoAsync(int appId, IReadOnlyList<long> classIds, string language);`
	`11`	`+ Task<AssetPriceResultModel> GetAssetPricesAsync(int appId, string currency, string language);`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,11 +14,12 @@ public SteamEconomy(string steamWebApiKey)`
`14`	`14`	`{`
`15`	`15`	`}`
`16`	`16`
`17`		`- public async Task<AssetClassInfoResultModel> GetAssetClassInfoAsync(int appId, IReadOnlyList<long> classIds)`
	`17`	`+ public async Task<AssetClassInfoResultModel> GetAssetClassInfoAsync(int appId, IReadOnlyList<long> classIds, string language = "en_us")`
`18`	`18`	`{`
`19`	`19`	`List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();`
`20`	`20`
`21`	`21`	`parameters.AddIfHasValue(appId, "appid");`
	`22`	`+ parameters.AddIfHasValue(language, "language");`
`22`	`23`	`parameters.AddIfHasValue(classIds.Count, "class_count");`
`23`	`24`
`24`	`25`	`for (int i = 0; i < classIds.Count; i++)`
`@@ -33,7 +34,7 @@ public async Task<AssetClassInfoResultModel> GetAssetClassInfoAsync(int appId, I`
`33`	`34`	`return assetClassInfoResultModel;`
`34`	`35`	`}`
`35`	`36`
`36`		`- public async Task<AssetPriceResultModel> GetAssetPricesAsync(int appId, string currency = "", string language = "")`
	`37`	`+ public async Task<AssetPriceResultModel> GetAssetPricesAsync(int appId, string currency = "", string language = "en_us")`
`37`	`38`	`{`
`38`	`39`	`List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public async Task<int> GetNumberOfCurrentPlayersForGameAsync(int appId)`
`70`	`70`	`return globalStatsResult.Result.PlayerCount;`
`71`	`71`	`}`
`72`	`72`
`73`		`- public async Task<PlayerAchievementResultModel> GetPlayerAchievementsAsync(int appId, long steamId, string language = "")`
	`73`	`+ public async Task<PlayerAchievementResultModel> GetPlayerAchievementsAsync(int appId, long steamId, string language = "en_us")`
`74`	`74`	`{`
`75`	`75`	`List<SteamWebRequestParameter> parameters = new List<SteamWebRequestParameter>();`
`76`	`76`	`parameters.AddIfHasValue(appId, "appid");`