Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion ComicRack.Engine/IO/ComicExporter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public string Export(IPagePool pagePool)
if (File.Exists(targetPath) && existsInDatabase && setting.Target == ExportTarget.ReplaceSource)
{
// If the file exists in the database and we are replacing the source, we throw an exception
throw new InvalidOperationException(StringUtility.Format(TR.Messages["AlreadyExistsInDatabase", "Resulting operation would result in a duplicate entry in the database, Output file '{0}' already exists in the library"], targetPath));
throw new InvalidOperationException(StringUtility.Format(TR.Messages["AlreadyExistsInDatabase", "This operation would result in a duplicate entry in the database, Output file '{0}' already exists in the library"], targetPath));
}
if ((setting.AddToLibrary || setting.Target == ExportTarget.ReplaceSource) && Providers.Readers.GetFormatProviderType(setting.FormatId) == null)
{
Expand Down
3 changes: 2 additions & 1 deletion ComicRack.Engine/Metadata/VirtualTags/VirtualTag.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Linq;
using System.Text;
using System.Xml.Serialization;
using cYo.Common.Localize;

namespace cYo.Projects.ComicRack.Engine
{
Expand Down Expand Up @@ -46,7 +47,7 @@ public VirtualTag(int id, string name, string description, string captionFormat,
public string PropertyName => $"VirtualTag{ID:00}";

[XmlIgnore]
public string DisplayMember => $"{ID:00}: {Name}{(IsEnabled ? " (Enabled)" : "")}";
public string DisplayMember => $"{ID:00}: {Name}{(IsEnabled ? $" ({TR.Default["Enabled"]})" : "")}";

public override bool Equals(object obj)
{
Expand Down
2 changes: 1 addition & 1 deletion ComicRack.sln
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5040C603-CDAE-46A1-B23E-CFC29319E770}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
CompressIconFolders.ps1 = CompressIconFolders.ps1
CompressFolders.ps1 = CompressFolders.ps1
directory.build.props = directory.build.props
Installer.iss = Installer.iss
README.md = README.md
Expand Down
4 changes: 2 additions & 2 deletions ComicRack/ComicRack.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="cd $(OutDir)&#xD;&#xA;echo %25cd%25&#xD;&#xA;xcopy /Y x64\pdfium.dll Resources\pdfium_x64.dll*&#xD;&#xA;xcopy /Y x86\pdfium.dll Resources\pdfium_x86.dll*&#xD;&#xA;rmdir /S /Q arm64&#xD;&#xA;rmdir /S /Q Lib&#xD;&#xA;rmdir /S /Q x64&#xD;&#xA;rmdir /S /Q x86&#xD;&#xA;rmdir /S /Q de&#xD;&#xA;&#xD;&#xA;if $(Configuration) == Debug Goto :Exit&#xD;&#xA;del /Q *.pdb&#xD;&#xA;&#xD;&#xA;: Exit" />
</Target>
<Target Name="CompressIconFolders" AfterTargets="PostBuild">
<Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(SolutionDir)CompressIconFolders.ps1&quot; -BaseDirectory &quot;$(OutDir)&quot;" />
<Target Name="CompressFolders" AfterTargets="PostBuild">
<Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(SolutionDir)CompressFolders.ps1&quot; -BaseDirectory &quot;$(OutDir)&quot;" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion ComicRack/Dialogs/ComicBookDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ private void SetDataToEditor(ComicBook comic)
//HACK: When a book contains only one page, display "1/1 Page(s)." Otherwise, it will incorrectly display "Page 2/1 Page(s)."
text = $"{comic.LastPageRead + (comic.PageCount == 1 ? 0 : 1)}/{text}";

string fileFormat = comic.ActualFileFormat != comic.FileFormat ? $"{comic.ActualFileFormat} (Actual){Environment.NewLine}{comic.FileFormat}" : comic.FileFormat;
string fileFormat = comic.ActualFileFormat != comic.FileFormat ? $"{comic.ActualFileFormat} ({TR.Default["Actual"]}){Environment.NewLine}{comic.FileFormat}" : comic.FileFormat;

EditControlUtility.SetLabel(lblPages, text);
EditControlUtility.SetLabel(lblType, $"{fileFormat}/{comic.FileSizeAsText}");
Expand Down
2 changes: 1 addition & 1 deletion ComicRack/Dialogs/DeviceEditControl.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion ComicRack/Dialogs/MatcherEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using cYo.Common;
using cYo.Common.Localize;
using cYo.Common.Text;
using cYo.Common.Windows;
using cYo.Common.Windows.Forms;
using cYo.Common.Windows.Forms.Theme;
using cYo.Projects.ComicRack.Engine;
Expand Down Expand Up @@ -64,7 +65,8 @@ public MatcherEditor(ComicBookMatcherCollection matchers, ComicBookValueMatcher
base.Height = btEdit.Bottom + 2;
base.Width = width;
spacing = rtfMatchValue2.Left - rtfMatchValue.Right;
InitializeMatcher(comicBookMatcher);
LocalizeUtility.Localize(TR.Load("MatcherEditor"), cmEdit);
InitializeMatcher(comicBookMatcher);
// a button pretending to be a dropdown combobox. lovely.
// let's dress it up as one. Except for dropdown arrow to carot - that's asking too much
// we also have to make it a bit smaller as otherwise borders are out of bounds
Expand Down
4 changes: 2 additions & 2 deletions ComicRack/Dialogs/PreferencesDialog.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion ComicRack/Dialogs/PreferencesDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1321,7 +1321,8 @@ private void AddVirtualTags()
for (int id = 1; id <= 20; id++)
{
VirtualTag vtag = Program.Settings.VirtualTags.FirstOrDefault(x => x.ID == id);
string name = $"Virtual Tag #{id:00}";
string vtagText = LocalizeUtility.GetText(this, "VirtualTag", "Virtual Tag");
string name = $"{vtagText} #{id:00}";
vtag = vtag is null
? new VirtualTag(id, name, name, string.Empty, isDefault: true) //If the data doesn't already exists, create an empty tag.
: new VirtualTag(vtag.ID, vtag.Name, vtag.Description, vtag.CaptionFormat, vtag.IsEnabled, vtag.IsDefault); // Otherwise create a new instance so that it doesn't edit the original until we save.
Expand Down Expand Up @@ -1410,6 +1411,7 @@ private void ResetVirtualTagsCaptionControls()
{
//Reset Insert Value button, Prefix & Suffix Textbox
btInsertValue.Text = "Choose Value";
LocalizeUtility.Localize(TR.Load(base.Name), btInsertValue);
btInsertValue.Tag = null;
txtCaptionPrefix.Text = string.Empty;
txtCaptionSuffix.Text = string.Empty;
Expand Down
3 changes: 2 additions & 1 deletion ComicRack/Dialogs/QuickRatingDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Windows.Forms;
using cYo.Common.ComponentModel;
using cYo.Common.Drawing;
using cYo.Common.Localize;
using cYo.Common.Windows;
using cYo.Common.Windows.Forms;
using cYo.Projects.ComicRack.Engine;
Expand Down Expand Up @@ -66,7 +67,7 @@ public static bool Show(IWin32Window parent, ComicBook book)
}
using (QuickRatingDialog quickRatingDialog = new QuickRatingDialog())
{
quickRatingDialog.Text = quickRatingDialog.Text + " - " + book.CaptionWithoutTitle;
quickRatingDialog.Text = $"{LocalizeUtility.GetText(quickRatingDialog, nameof(QuickRatingDialog), quickRatingDialog.Text)} - {book.CaptionWithoutTitle}";
quickRatingDialog.txReview.Text = book.Review;
quickRatingDialog.txRating.Rating = book.Rating;
quickRatingDialog.chkShow.Checked = Program.Settings.AutoShowQuickReview;
Expand Down
Binary file removed ComicRack/Output/Languages/cs-CZ.zip
Binary file not shown.
8 changes: 8 additions & 0 deletions ComicRack/Output/Languages/cs-CZ/AddItemDialog.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0"?>
<TR xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="ListSelectorControl" CultureName="cs-CZ">
<Texts>
<Text Key="btCancel" Text="&amp;Storno" Comment="&amp;Cancel" />
<Text Key="btOK" Text="&amp;OK" Comment="&amp;OK" />
<Text Key="lblName" Text="Název:" Comment="Name:" />
</Texts>
</TR>
Loading