Skip to content

Commit 0508833

Browse files
MuchiachioMuchiachio
committed
Shared header resources
- Fixed, header naming not working correctly then specified controller name is already plural.
1 parent 1116c85 commit 0508833

File tree

18 files changed

+33
-38
lines changed

18 files changed

+33
-38
lines changed

‎src/MvcTemplate.Resources/Shared/Headers.Designer.cs

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/MvcTemplate.Resources/Shared/Headers.lt.resx

+4-4
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,16 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="AdministrationAccount" xml:space="preserve">
120+
<data name="AdministrationAccounts" xml:space="preserve">
121121
<value>Naudotojas</value>
122122
</data>
123-
<data name="AdministrationAccounts" xml:space="preserve">
123+
<data name="AdministrationAccountsIndex" xml:space="preserve">
124124
<value>Naudotojai</value>
125125
</data>
126-
<data name="AdministrationRole" xml:space="preserve">
126+
<data name="AdministrationRoles" xml:space="preserve">
127127
<value>Rolė</value>
128128
</data>
129-
<data name="AdministrationRoles" xml:space="preserve">
129+
<data name="AdministrationRolesIndex" xml:space="preserve">
130130
<value>Rolės</value>
131131
</data>
132132
<data name="Profile" xml:space="preserve">

‎src/MvcTemplate.Resources/Shared/Headers.resx

+4-4
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,16 @@
117117
<resheader name="writer">
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<data name="AdministrationAccount" xml:space="preserve">
120+
<data name="AdministrationAccounts" xml:space="preserve">
121121
<value>Account</value>
122122
</data>
123-
<data name="AdministrationAccounts" xml:space="preserve">
123+
<data name="AdministrationAccountsIndex" xml:space="preserve">
124124
<value>Accounts</value>
125125
</data>
126-
<data name="AdministrationRole" xml:space="preserve">
126+
<data name="AdministrationRoles" xml:space="preserve">
127127
<value>Role</value>
128128
</data>
129-
<data name="AdministrationRoles" xml:space="preserve">
129+
<data name="AdministrationRolesIndex" xml:space="preserve">
130130
<value>Roles</value>
131131
</data>
132132
<data name="Profile" xml:space="preserve">

‎src/MvcTemplate.Web/CodeTemplates/Scaffolders/Module/ModuleFunctions.ps1

+3-8
Original file line numberDiff line numberDiff line change
@@ -65,20 +65,15 @@ Function Scaffold-CshtmlTemplate([String]$Template, [String]$Project, [String]$O
6565
Return;
6666
}
6767

68-
$HeaderSingularTitle = $Controller
69-
$HeaderPluralTitle = Get-PluralizedWord $Controller
70-
if ($Area) {
71-
$HeaderPluralTitle = $Area + $HeaderPluralTitle
72-
$HeaderSingularTitle = $Area + $HeaderSingularTitle
73-
}
68+
$HeaderTitle = $Controller
69+
if ($Area) { $HeaderTitle = $Area + $HeaderTitle }
7470

7571
Add-ProjectItemViaTemplate `
7672
-OutputPath $OutputPath `
7773
-Template $Template `
7874
-Model @{ `
7975
View = $Model + "View"; `
80-
HeaderPluralTitle = $HeaderPluralTitle; `
81-
HeaderSingularTitle = $HeaderSingularTitle; `
76+
HeaderTitle = $HeaderTitle; `
8277
} `
8378
-SuccessMessage "Added $Project\{0}." `
8479
-TemplateFolders $TemplateFolders `

‎src/MvcTemplate.Web/CodeTemplates/Scaffolders/Module/Views/Create.cs.t4

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="widget-box">
77
<div class="widget-title">
88
<span class="widget-title-icon fa fa-th-list"></span>
9-
<h5>@Headers.<#= Model.HeaderSingularTitle #></h5>
9+
<h5>@Headers.<#= Model.HeaderTitle #></h5>
1010
</div>
1111
<div class="widget-content">
1212
@using (Html.BeginForm())

‎src/MvcTemplate.Web/CodeTemplates/Scaffolders/Module/Views/Delete.cs.t4

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="widget-box">
77
<div class="widget-title">
88
<span class="widget-title-icon fa fa-th-list"></span>
9-
<h5>@Headers.<#= Model.HeaderSingularTitle #></h5>
9+
<h5>@Headers.<#= Model.HeaderTitle #></h5>
1010
<div class="widget-title-buttons">
1111
@if (Html.IsAuthorizedFor("Details"))
1212
{

‎src/MvcTemplate.Web/CodeTemplates/Scaffolders/Module/Views/Details.cs.t4

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="widget-box">
77
<div class="widget-title">
88
<span class="widget-title-icon fa fa-th-list"></span>
9-
<h5>@Headers.<#= Model.HeaderSingularTitle #></h5>
9+
<h5>@Headers.<#= Model.HeaderTitle #></h5>
1010
<div class="widget-title-buttons">
1111
@if (Html.IsAuthorizedFor("Edit"))
1212
{

‎src/MvcTemplate.Web/CodeTemplates/Scaffolders/Module/Views/Edit.cs.t4

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="widget-box">
77
<div class="widget-title">
88
<span class="widget-title-icon fa fa-th-list"></span>
9-
<h5>@Headers.<#= Model.HeaderSingularTitle #></h5>
9+
<h5>@Headers.<#= Model.HeaderTitle #></h5>
1010
<div class="widget-title-buttons">
1111
@if (Html.IsAuthorizedFor("Details"))
1212
{

‎src/MvcTemplate.Web/CodeTemplates/Scaffolders/Module/Views/Index.cs.t4

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<div class="widget-box">
77
<div class="widget-title">
88
<span class="widget-title-icon fa fa-th"></span>
9-
<h5>@Headers.<#= Model.HeaderPluralTitle #></h5>
9+
<h5>@Headers.<#= Model.HeaderTitle #>Index</h5>
1010
<div class="widget-title-buttons">
1111
@if (Html.IsAuthorizedFor("Create"))
1212
{

‎src/MvcTemplate.Web/Views/Administration/Accounts/Create.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="widget-box">
55
<div class="widget-title">
66
<span class="widget-title-icon fa fa-th-list"></span>
7-
<h5>@Headers.AdministrationAccount</h5>
7+
<h5>@Headers.AdministrationAccounts</h5>
88
</div>
99
<div class="widget-content">
1010
@using (Html.BeginForm())

‎src/MvcTemplate.Web/Views/Administration/Accounts/Details.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="widget-box">
55
<div class="widget-title">
66
<span class="widget-title-icon fa fa-th-list"></span>
7-
<h5>@Headers.AdministrationAccount</h5>
7+
<h5>@Headers.AdministrationAccounts</h5>
88
<div class="widget-title-buttons">
99
@if (Html.IsAuthorizedFor("Edit"))
1010
{

‎src/MvcTemplate.Web/Views/Administration/Accounts/Edit.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="widget-box">
55
<div class="widget-title">
66
<span class="widget-title-icon fa fa-th-list"></span>
7-
<h5>@Headers.AdministrationAccount</h5>
7+
<h5>@Headers.AdministrationAccounts</h5>
88
<div class="widget-title-buttons">
99
@if (Html.IsAuthorizedFor("Details"))
1010
{

‎src/MvcTemplate.Web/Views/Administration/Accounts/Index.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="widget-box">
55
<div class="widget-title">
66
<span class="widget-title-icon fa fa-th"></span>
7-
<h5>@Headers.AdministrationAccounts</h5>
7+
<h5>@Headers.AdministrationAccountsIndex</h5>
88
<div class="widget-title-buttons">
99
@if (Html.IsAuthorizedFor("Create"))
1010
{

‎src/MvcTemplate.Web/Views/Administration/Roles/Create.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="widget-box">
55
<div class="widget-title">
66
<span class="widget-title-icon fa fa-th-list"></span>
7-
<h5>@Headers.AdministrationRole</h5>
7+
<h5>@Headers.AdministrationRoles</h5>
88
</div>
99
<div class="widget-content">
1010
@using (Html.BeginForm())

‎src/MvcTemplate.Web/Views/Administration/Roles/Delete.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="widget-box">
55
<div class="widget-title">
66
<span class="widget-title-icon fa fa-th-list"></span>
7-
<h5>@Headers.AdministrationRole</h5>
7+
<h5>@Headers.AdministrationRoles</h5>
88
<div class="widget-title-buttons">
99
@if (Html.IsAuthorizedFor("Details"))
1010
{

‎src/MvcTemplate.Web/Views/Administration/Roles/Details.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="widget-box">
55
<div class="widget-title">
66
<span class="widget-title-icon fa fa-th-list"></span>
7-
<h5>@Headers.AdministrationRole</h5>
7+
<h5>@Headers.AdministrationRoles</h5>
88
<div class="widget-title-buttons">
99
@if (Html.IsAuthorizedFor("Edit"))
1010
{

‎src/MvcTemplate.Web/Views/Administration/Roles/Edit.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="widget-box">
55
<div class="widget-title">
66
<span class="widget-title-icon fa fa-th-list"></span>
7-
<h5>@Headers.AdministrationRole</h5>
7+
<h5>@Headers.AdministrationRoles</h5>
88
<div class="widget-title-buttons">
99
@if (Html.IsAuthorizedFor("Details"))
1010
{

‎src/MvcTemplate.Web/Views/Administration/Roles/Index.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<div class="widget-box">
55
<div class="widget-title">
66
<span class="widget-title-icon fa fa-th"></span>
7-
<h5>@Headers.AdministrationRoles</h5>
7+
<h5>@Headers.AdministrationRolesIndex</h5>
88
<div class="widget-title-buttons">
99
@if (Html.IsAuthorizedFor("Create"))
1010
{

0 commit comments

Comments
 (0)