From 7e149c4bc132ab9b5fff4710f9fd6f2ed0903e83 Mon Sep 17 00:00:00 2001 From: Rob King Date: Wed, 10 Jun 2015 10:07:04 +0100 Subject: [PATCH] Replaced string.format with Localizable T --- .../Orchard.Recipes/RecipeHandlers/CommandRecipeHandler.cs | 2 +- .../Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs | 2 +- .../Orchard.Recipes/RecipeHandlers/ModuleRecipeHandler.cs | 2 +- .../Orchard.Recipes/RecipeHandlers/SettingsRecipeHandler.cs | 2 +- .../Modules/Orchard.Roles/ImportExport/RolesRecipeHandler.cs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/CommandRecipeHandler.cs b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/CommandRecipeHandler.cs index e8a653bf3..7e8f2b070 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/CommandRecipeHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/CommandRecipeHandler.cs @@ -47,7 +47,7 @@ namespace Orchard.Recipes.RecipeHandlers { foreach (var command in commands) { if (!String.IsNullOrEmpty(command)) { if (!String.IsNullOrEmpty(recipeContext.ExecutionId)) { - _recipeJournal.WriteJournalEntry(recipeContext.ExecutionId, string.Format("Commands: Executing item {0}.", command)); + _recipeJournal.WriteJournalEntry(recipeContext.ExecutionId, T("Commands: Executing item {0}.", command).Text); } var commandParameters = _commandParser.ParseCommandParameters(command); var input = new StringReader(""); diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs index 643526d40..c7cca8fd8 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/DataRecipeHandler.cs @@ -57,7 +57,7 @@ namespace Orchard.Recipes.RecipeHandlers { while (nextIdentity != null) { if (!string.IsNullOrEmpty(recipeContext.ExecutionId) && elementDictionary[nextIdentity.ToString()].HasAttributes) { var itemId = elementDictionary[nextIdentity.ToString()].FirstAttribute.Value; - _recipeJournal.WriteJournalEntry(recipeContext.ExecutionId, string.Format("Data: Importing {0}.", itemId)); + _recipeJournal.WriteJournalEntry(recipeContext.ExecutionId, T("Data: Importing {0}.", itemId).Text); } _orchardServices.ContentManager.Import( elementDictionary[nextIdentity.ToString()], diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/ModuleRecipeHandler.cs b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/ModuleRecipeHandler.cs index be0666d85..75d1e11a1 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/ModuleRecipeHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/ModuleRecipeHandler.cs @@ -91,7 +91,7 @@ namespace Orchard.Recipes.RecipeHandlers { if (packagingEntry != null) { if (!ModuleAlreadyInstalled(packagingEntry.PackageId)) { if (!string.IsNullOrEmpty(recipeContext.ExecutionId)) { - _recipeJournal.WriteJournalEntry(recipeContext.ExecutionId, string.Format("Installing module: {0}.", packagingEntry.Title)); + _recipeJournal.WriteJournalEntry(recipeContext.ExecutionId, T("Installing module: {0}.", packagingEntry.Title).Text); } _packageManager.Install(packagingEntry.PackageId, packagingEntry.Version, packagingSource.FeedUrl, HostingEnvironment.MapPath("~/")); } diff --git a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/SettingsRecipeHandler.cs b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/SettingsRecipeHandler.cs index 5bb8e4084..b0612fe7c 100644 --- a/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/SettingsRecipeHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Recipes/RecipeHandlers/SettingsRecipeHandler.cs @@ -59,7 +59,7 @@ namespace Orchard.Recipes.RecipeHandlers { } if (!string.IsNullOrEmpty(recipeContext.ExecutionId)) { - _recipeJournal.WriteJournalEntry(recipeContext.ExecutionId, string.Format("Setting: {0}.", contentPart.PartDefinition.Name)); + _recipeJournal.WriteJournalEntry(recipeContext.ExecutionId, T("Setting: {0}.", contentPart.PartDefinition.Name).Text); } ImportSettingPart(contentPart, partElement); diff --git a/src/Orchard.Web/Modules/Orchard.Roles/ImportExport/RolesRecipeHandler.cs b/src/Orchard.Web/Modules/Orchard.Roles/ImportExport/RolesRecipeHandler.cs index ffb89a6c9..473f68f09 100644 --- a/src/Orchard.Web/Modules/Orchard.Roles/ImportExport/RolesRecipeHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Roles/ImportExport/RolesRecipeHandler.cs @@ -42,7 +42,7 @@ namespace Orchard.Roles.ImportExport { var roleName = roleElement.Attribute("Name").Value; if (string.IsNullOrEmpty(recipeContext.ExecutionId)) { - _recipeJournal.WriteJournalEntry(recipeContext.ExecutionId, string.Format("Roles: Executing item {0}.", roleName)); + _recipeJournal.WriteJournalEntry(recipeContext.ExecutionId, T("Roles: Executing item {0}.", roleName).Text); } var role = _roleService.GetRoleByName(roleName);