From 280f015e1d54b3a288431bdb0a9f923c1bbd7d1c Mon Sep 17 00:00:00 2001 From: BertrandLeRoy Date: Tue, 19 Oct 2010 12:10:10 -0700 Subject: [PATCH 1/2] Fixing typo. --HG-- branch : dev --- .../Migration/Interpreters/DefaultDataMigrationInterpreter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs b/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs index 24039ba9d..0c97a6ab0 100644 --- a/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs +++ b/src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs @@ -194,7 +194,7 @@ namespace Orchard.Data.Migration.Interpreters { } else { if(command.Length > 0 || command.Precision > 0 || command.Scale > 0) { - throw new OrchardException(T("Error while executing data migration: you need to specify the field's type in order to change it's properies")); + throw new OrchardException(T("Error while executing data migration: you need to specify the field's type in order to change its properties")); } } From e9c5c16f6f5753f60068d044bd2e0e85ab5587f1 Mon Sep 17 00:00:00 2001 From: Dave Reed Date: Tue, 19 Oct 2010 12:12:03 -0700 Subject: [PATCH 2/2] Converting usages of Html.LabelFor to the localizable overload. Also inserted spaces where necessary (e.g. 'TagName' -> 'Tag Name'). --HG-- branch : dev --- .../Views/EditorTemplates/Parts/Common.Owner.cshtml | 2 +- .../Views/EditorTemplates/Parts/Routable.RoutePart.cshtml | 2 +- .../Views/EditorTemplates/Parts/Blogs.Blog.Fields.cshtml | 2 +- .../Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml | 2 +- .../EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml | 4 ++-- .../Orchard.Experimental/Views/Commands/Execute.cshtml | 2 +- .../Orchard.Packaging/Views/Gallery/Harvest.cshtml | 2 +- .../Modules/Orchard.Tags/Views/Admin/Create.cshtml | 2 +- .../Modules/Orchard.Tags/Views/Admin/Edit.cshtml | 2 +- .../Orchard.Tags/Views/EditorTemplates/Parts/Tags.cshtml | 2 +- .../Modules/Orchard.Users/Views/Admin/Create.cshtml | 8 ++++---- .../Modules/Orchard.Users/Views/Admin/Edit.cshtml | 4 ++-- .../Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml | 6 +++--- .../Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml index 87035578a..fb6dc30b1 100644 --- a/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml +++ b/src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Owner.cshtml @@ -1,7 +1,7 @@ @model OwnerEditorViewModel @using Orchard.Core.Common.ViewModels;
- @Html.LabelFor(m=>m.Owner) + @Html.LabelFor(m => m.Owner, T("Owner")) @Html.EditorFor(m=>m.Owner) @Html.ValidationMessageFor(m=>m.Owner)
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml index 0fe8b6b78..483135db2 100644 --- a/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml +++ b/src/Orchard.Web/Core/Routable/Views/EditorTemplates/Parts/Routable.RoutePart.cshtml @@ -3,7 +3,7 @@ @{ Script.Require("Slugify"); }
- @Html.LabelFor(m => m.Title) + @Html.LabelFor(m => m.Title, T("Title")) @Html.TextBoxFor(m => m.Title, new { @class = "large text" })
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.cshtml index 2d884de4c..a9bf742b0 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.cshtml @@ -1,5 +1,5 @@ @model Orchard.Blogs.Models.BlogPart
- @Html.LabelFor(m => m.Description) + @Html.LabelFor(m => m.Description, T("Description")) @Html.TextAreaFor(m => m.Description, 5, 60, null)
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml index 1f29a1f88..baea01a1e 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml @@ -1,7 +1,7 @@ @model Orchard.Blogs.Models.BlogArchivesPart
- @Html.LabelFor(m => m.ForBlog) + @Html.LabelFor(m => m.ForBlog, T("For Blog")) @Html.TextBoxFor(m => m.ForBlog) @T("Show the archives for which blog? Note: specify the blog's slug.")
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml index e8cf87dda..f705bf2b3 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml @@ -1,11 +1,11 @@ @model Orchard.Blogs.Models.RecentBlogPostsPart
- @Html.LabelFor(m => m.ForBlog) + @Html.LabelFor(m => m.ForBlog, T("For Blog")) @Html.TextBoxFor(m => m.ForBlog)
- @Html.LabelFor(m => m.Count) + @Html.LabelFor(m => m.Count, T("Count")) @Html.TextBoxFor(m => m.Count)
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.cshtml index 622744600..388ce7a2c 100644 --- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Commands/Execute.cshtml @@ -12,7 +12,7 @@ } - @Html.LabelFor(m => m.CommandLine) + @Html.LabelFor(m => m.CommandLine, T("Command Line")) @Html.TextBoxFor(m => m.CommandLine, new { style = "width:100%;" }) @Html.ValidationMessageFor(m => m.CommandLine) 
@Model.Results
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.cshtml index 23e3ebc83..816701f86 100644 --- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.cshtml @@ -22,7 +22,7 @@
}
- @Html.LabelFor(m=>m.FeedUrl) + @Html.LabelFor(m => m.FeedUrl, T("Feed Url")) @Html.DropDownListFor(m => m.FeedUrl, new[]{new SelectListItem{Text=T("Download").ToString(),Value="Download"}}.Concat( Model.Sources.Select(x => new SelectListItem { Text = T("Push to {0}", x.FeedUrl).ToString(), Value = x.FeedUrl }))) @Html.ValidationMessageFor(m=>m.FeedUrl)
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.cshtml index 055e5271f..4c02b8174 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.cshtml @@ -5,7 +5,7 @@ @Html.ValidationSummary()
- @Html.LabelFor(m=>m.TagName) + @Html.LabelFor(m => m.TagName, T("Tag Name")) @Html.TextBoxFor(m=>m.TagName, new { @class = "text" })
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml index 4e33a45c5..f316cb394 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml @@ -5,7 +5,7 @@ @Html.ValidationSummary()
@Html.HiddenFor(m=>m.Id) - @Html.LabelFor(m=>m.TagName) + @Html.LabelFor(m => m.TagName, T("Tag Name")) @Html.TextBoxFor(m=>m.TagName, new { @class = "text" })
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/EditorTemplates/Parts/Tags.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/EditorTemplates/Parts/Tags.cshtml index 22e27f20e..a768df01d 100644 --- a/src/Orchard.Web/Modules/Orchard.Tags/Views/EditorTemplates/Parts/Tags.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/EditorTemplates/Parts/Tags.cshtml @@ -1,6 +1,6 @@ @model Orchard.Tags.ViewModels.EditTagsViewModel
- @Html.LabelFor(m => m.Tags) + @Html.LabelFor(m => m.Tags, T("Tags")) @Html.TextBoxFor(m => m.Tags, new { @class = "large text" })
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml index 277ffc99a..8f4011930 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml @@ -5,25 +5,25 @@ @Html.ValidationSummary()
- @Html.LabelFor(m=>m.UserName) + @Html.LabelFor(m => m.UserName, T("User Name")) @Html.TextBoxFor(m=>m.UserName, new { @class = "textMedium" }) @Html.ValidationMessageFor(m=>m.UserName, "*")
- @Html.LabelFor(m=>m.Email) + @Html.LabelFor(m => m.Email, T("Email")) @Html.TextBoxFor(m=>m.Email, new { @class = "textMedium" }) @Html.ValidationMessageFor(m=>m.Email, "*")
- @Html.LabelFor(m=>m.Password) + @Html.LabelFor(m => m.Password, T("Password")) @Html.PasswordFor(m=>m.Password, new { @class = "textMedium" }) @Html.ValidationMessageFor(m=>m.Password, "*")
- @Html.LabelFor(m=>m.ConfirmPassword) + @Html.LabelFor(m => m.ConfirmPassword, T("Confirm Password")) @Html.PasswordFor(m=>m.ConfirmPassword, new { @class = "textMedium" }) @Html.ValidationMessageFor(m=>m.ConfirmPassword, "*")
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml index b138c4af4..362228de1 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml @@ -5,13 +5,13 @@ @Html.ValidationSummary() @Html.EditorFor(m=>m.Id)
- @Html.LabelFor(m=>m.UserName) + @Html.LabelFor(m => m.UserName, T("User Name")) @Html.TextBoxFor(m=>m.UserName, new { @class = "textMedium" }) @Html.ValidationMessageFor(m=>m.UserName, "*")
- @Html.LabelFor(m=>m.Email) + @Html.LabelFor(m => m.Email, T("Email")) @Html.TextBoxFor(m=>m.Email, new { @class = "textMedium" }) @Html.ValidationMessageFor(m=>m.Email, "*")
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml index e31e1b67e..352b73dc4 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.LayerPart.cshtml @@ -1,16 +1,16 @@ @model Orchard.Widgets.Models.LayerPart
- @Html.LabelFor(layer => layer.Name) + @Html.LabelFor(layer => layer.Name, T("Name")) @Html.TextBoxFor(layer => layer.Name)
- @Html.LabelFor(layer => layer.Description) + @Html.LabelFor(layer => layer.Description, T("Description")) @Html.TextAreaFor(layer => layer.Description)
- @Html.LabelFor(layer => layer.LayerRule) + @Html.LabelFor(layer => layer.LayerRule, T("Layer Rule")) @Html.TextAreaFor(layer => layer.LayerRule)
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml index 573edadd0..c419a0e5e 100644 --- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts/Widgets.WidgetPart.cshtml @@ -1,11 +1,11 @@ @model Orchard.Widgets.Models.WidgetPart
- @Html.LabelFor(widget => widget.Zone) + @Html.LabelFor(widget => widget.Zone, T("Zone")) @Html.DropDownListFor(widget => widget.Zone, new SelectList(Model.AvailableZones))
- @Html.LabelFor(widget => widget.Title) + @Html.LabelFor(widget => widget.Title, T("Title")) @Html.TextBoxFor(widget => widget.Title)
\ No newline at end of file