Skip to content

Commit

Permalink
Use constants for the keys
Browse files Browse the repository at this point in the history
  • Loading branch information
Ramo-Y committed Jul 14, 2024
1 parent 204e377 commit 6630ae2
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 37 deletions.
35 changes: 35 additions & 0 deletions src/BulkRename/Constants/LocalizationConstants.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
namespace BulkRename.Constants
{
public static class LocalizationConstants
{
public const string AN_ERROR_OCCURED_HEADER = "AnErrorOccuredHeader";

public const string DETAILED_ERROR_MESSAGE = "DetailedErrorMessage";

public const string DEVELOPMENT_MODE = "DevelopmentMode";

public const string ERROR = "Error";

public const string HISTORY = "History";

public const string HOME = "Home";

public const string LOAD_HISTORY = "LoadHistory";

public const string NEW_NAME = "NewName";

public const string OLD_NAME = "OldName";

public const string PREVIEW_RENAMING_OF_TV_SHOWS = "PreviewRenamingOfTvShows";

public const string RENAMED_ON = "RenamedOn";

public const string SERIES = "Series";

public const string SUCCESSFULLY_RENAMED_FILES = "SuccessfullyRenamedFiles";

public const string SWAPPING_TO_DEVELOPMENT_MODE_DISPLAY = "SwappingToDevelopmentModeDisplay";

public const string WELCOME_TO_BULK_RENAME = "WelcomeToBulkRename";
}
}
11 changes: 6 additions & 5 deletions src/BulkRename/Controllers/HistoryController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
namespace BulkRename.Controllers
{
using BulkRename.Constants;
using BulkRename.Interfaces;
using BulkRename.Models;
using Microsoft.AspNetCore.Mvc;
Expand All @@ -8,15 +9,16 @@
public class HistoryController : Controller
{
private readonly IPersistanceService _persistanceService;

private readonly IStringLocalizer<SharedResource> _sharedLocalizer;

private static readonly Dictionary<string, List<Series>> _dictionary = [];

private readonly string _renamedOn;

public HistoryController(IPersistanceService persistanceService, IStringLocalizer<SharedResource> sharedLocalizer)
{
_persistanceService = persistanceService;
_sharedLocalizer = sharedLocalizer;

_renamedOn = sharedLocalizer[LocalizationConstants.RENAMED_ON];
}

public IActionResult Index()
Expand All @@ -26,7 +28,6 @@ public IActionResult Index()

public async Task<IActionResult> LoadHistory()
{
var renamedOn = _sharedLocalizer["RenamedOn"];
_dictionary.Clear();

var renamingSessionToEpisodes = await _persistanceService.LoadRenamingHistory();
Expand All @@ -52,7 +53,7 @@ public async Task<IActionResult> LoadHistory()
});
}

var key = $"{renamingSessionToEpisode.RenamingSession.RenName}, {renamedOn}: {renamingSessionToEpisode.RenamingSession.RenExecutingDateTime:yyyy-MM-dd HH:mm:ss}";
var key = $"{renamingSessionToEpisode.RenamingSession.RenName}, {_renamedOn}: {renamingSessionToEpisode.RenamingSession.RenExecutingDateTime:yyyy-MM-dd HH:mm:ss}";
_dictionary.Add(key, series);
}

Expand Down
11 changes: 6 additions & 5 deletions src/BulkRename/Views/History/Index.cshtml
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
@using Microsoft.Extensions.Localization
@using BulkRename.Constants
@using Microsoft.Extensions.Localization

@inject IStringLocalizer<SharedResource> SharedLocalizer

@model Dictionary<string, List<Series>>

@{
ViewData["Title"] = SharedLocalizer["History"];
ViewData["Title"] = SharedLocalizer[LocalizationConstants.HISTORY];
}

<!DOCTYPE html>

<head>
<title>@SharedLocalizer["History"]</title>
<title>@SharedLocalizer[LocalizationConstants.HISTORY]</title>
<meta charset="utf-8" />
</head>

<head>
<meta charset="utf-8" />
<title>@SharedLocalizer["Series"]</title>
<title>@SharedLocalizer[LocalizationConstants.SERIES]</title>
<link href="~/css/customStyles.css" rel="stylesheet" />
</head>

<div class="text-start">
<a class="btn btn-primary" href="@Url.Action("LoadHistory", "History")">@SharedLocalizer["LoadHistory"]</a>
<a class="btn btn-primary" href="@Url.Action("LoadHistory", "History")">@SharedLocalizer[LocalizationConstants.LOAD_HISTORY]</a>
</div>

<br />
Expand Down
11 changes: 6 additions & 5 deletions src/BulkRename/Views/Home/Index.cshtml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
@using Microsoft.Extensions.Localization
@using BulkRename.Constants
@using Microsoft.Extensions.Localization

@inject IStringLocalizer<SharedResource> SharedLocalizer

@{
ViewData["Title"] = @SharedLocalizer["Home"];
ViewData["Title"] = @SharedLocalizer[LocalizationConstants.HOME];
}

<head>
<title>@SharedLocalizer["Home"]</title>
<title>@SharedLocalizer[LocalizationConstants.HOME]</title>
<meta charset="utf-8"/>
</head>

<div class="text-center">
<h1 class="display-4">@SharedLocalizer["WelcomeToBulkRename"]</h1>
<a class="btn btn-primary" href="Series">@SharedLocalizer["PreviewRenamingOfTvShows"]</a>
<h1 class="display-4">@SharedLocalizer[LocalizationConstants.WELCOME_TO_BULK_RENAME]</h1>
<a class="btn btn-primary" href="Series">@SharedLocalizer[LocalizationConstants.PREVIEW_RENAMING_OF_TV_SHOWS]</a>
</div>
7 changes: 4 additions & 3 deletions src/BulkRename/Views/Series/Index.cshtml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
@using Microsoft.Extensions.Localization
@using BulkRename.Constants
@using Microsoft.Extensions.Localization

@inject IStringLocalizer<SharedResource> SharedLocalizer

@{
ViewData["Title"] = @SharedLocalizer["Series"];
ViewData["Title"] = @SharedLocalizer[LocalizationConstants.SERIES];
}

@model Dictionary<string, List<Series>>
Expand All @@ -12,7 +13,7 @@

<head>
<meta charset="utf-8"/>
<title>@SharedLocalizer["Series"]</title>
<title>@SharedLocalizer[LocalizationConstants.SERIES]</title>
<link href="~/css/customStyles.css" rel="stylesheet"/>
</head>

Expand Down
9 changes: 5 additions & 4 deletions src/BulkRename/Views/Series/Rename.cshtml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
@using Microsoft.Extensions.Localization
@using BulkRename.Constants
@using Microsoft.Extensions.Localization

@inject IStringLocalizer<SharedResource> SharedLocalizer

@{
ViewData["Title"] = @SharedLocalizer["Series"];
ViewData["Title"] = @SharedLocalizer[LocalizationConstants.SERIES];
}

@model Dictionary<string, List<Series>>
Expand All @@ -12,10 +13,10 @@

<head>
<meta charset="utf-8"/>
<title>@SharedLocalizer["Series"]</title>
<title>@SharedLocalizer[LocalizationConstants.SERIES]</title>
<link href="~/css/customStyles.css" rel="stylesheet"/>
</head>

<h1>@SharedLocalizer["SuccessfullyRenamedFiles"]</h1>
<h1>@SharedLocalizer[LocalizationConstants.SUCCESSFULLY_RENAMED_FILES]</h1>

@Html.DisplayFor(model => model, "SeriesTable")
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@using Microsoft.Extensions.Localization
@using BulkRename.Constants
@using Microsoft.Extensions.Localization

@inject IStringLocalizer<SharedResource> SharedLocalizer

Expand All @@ -10,8 +11,8 @@
<table class="customtable">
<tbody>
<tr>
<th class="oldname">@SharedLocalizer["OldName"]</th>
<th class="newname">@SharedLocalizer["NewName"]</th>
<th class="oldname">@SharedLocalizer[LocalizationConstants.OLD_NAME]</th>
<th class="newname">@SharedLocalizer[LocalizationConstants.NEW_NAME]</th>
</tr>
@foreach (var ser in s.Value)
{
Expand Down
15 changes: 8 additions & 7 deletions src/BulkRename/Views/Shared/Error.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@using Microsoft.AspNetCore.Mvc.Localization
@using BulkRename.Constants
@using Microsoft.AspNetCore.Mvc.Localization
@using Microsoft.Extensions.Localization

@inject IStringLocalizer<SharedResource> SharedLocalizer
Expand All @@ -7,11 +8,11 @@
@model ErrorViewModel

@{
ViewData["Title"] = SharedLocalizer["Error"];
ViewData["Title"] = SharedLocalizer[LocalizationConstants.ERROR];
}

<h1 class="text-danger">@SharedLocalizer["Error"].</h1>
<h2 class="text-danger">@SharedLocalizer["AnErrorOccuredHeader"]</h2>
<h1 class="text-danger">@SharedLocalizer[LocalizationConstants.ERROR].</h1>
<h2 class="text-danger">@SharedLocalizer[LocalizationConstants.AN_ERROR_OCCURED_HEADER]</h2>

@if (Model?.ShowRequestId ?? false)
{
Expand All @@ -20,10 +21,10 @@
</p>
}

<h3>@SharedLocalizer["DevelopmentMode"]</h3>
<h3>@SharedLocalizer[LocalizationConstants.DEVELOPMENT_MODE]</h3>
<p>
@SharedHtmlLocalizer["SwappingToDevelopmentModeDisplay"]
@SharedHtmlLocalizer[LocalizationConstants.SWAPPING_TO_DEVELOPMENT_MODE_DISPLAY]
</p>
<p>
@SharedHtmlLocalizer["DetailedErrorMessage"]
@SharedHtmlLocalizer[LocalizationConstants.DETAILED_ERROR_MESSAGE]
</p>
11 changes: 6 additions & 5 deletions src/BulkRename/Views/Shared/_Layout.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@using Microsoft.Extensions.Localization
@using BulkRename.Constants
@using Microsoft.Extensions.Localization

@inject IStringLocalizer<SharedResource> SharedLocalizer

Expand All @@ -25,13 +26,13 @@
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
<ul class="navbar-nav flex-grow-1">
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">@SharedLocalizer["Home"]</a>
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Index">@SharedLocalizer[LocalizationConstants.HOME]</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="Series" asp-action="Index">@SharedLocalizer["Series"]</a>
<a class="nav-link text-dark" asp-area="" asp-controller="Series" asp-action="Index">@SharedLocalizer[LocalizationConstants.SERIES]</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="History" asp-action="Index">@SharedLocalizer["History"]</a>
<a class="nav-link text-dark" asp-area="" asp-controller="History" asp-action="Index">@SharedLocalizer[LocalizationConstants.HISTORY]</a>
</li>
</ul>
</div>
Expand All @@ -46,7 +47,7 @@

<footer class="border-top footer text-muted">
<div class="container">
&copy; 2024 - BulkRename - <a asp-area="" asp-controller="Home" asp-action="Index">@SharedLocalizer["Home"]</a>
&copy; 2024 - BulkRename - <a asp-area="" asp-controller="Home" asp-action="Index">@SharedLocalizer[LocalizationConstants.HOME]</a>
</div>
</footer>
<script src="~/lib/jquery/dist/jquery.min.js"></script>
Expand Down

0 comments on commit 6630ae2

Please sign in to comment.