Skip to content

Commit

Permalink
All - Fix Build + Update Deps + Update Translations
Browse files Browse the repository at this point in the history
  • Loading branch information
nlogozzo committed Jan 5, 2024
1 parent bf637e5 commit 82bbaf5
Show file tree
Hide file tree
Showing 25 changed files with 61 additions and 63 deletions.
2 changes: 1 addition & 1 deletion NickvisionMoney.GNOME/NickvisionMoney.GNOME.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="GirCore.Adw-1" Version="0.5.0-preview.3" />
<PackageReference Include="Nickvision.Aura" Version="2023.11.3" />
<PackageReference Include="Nickvision.Aura" Version="2023.11.4" />
<PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion NickvisionMoney.GNOME/Views/MainWindow.cs
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ private void About(Gio.SimpleAction sender, EventArgs e)
/// <param name="e">Gtk.DropTarget.DropSignalArgs</param>
private bool OnDrop(Gtk.DropTarget sender, Gtk.DropTarget.DropSignalArgs e)
{
var file = new Gio.FileHlper(e.Value.GetObject()!.Handle, false);
var file = new Gio.FileHelper(e.Value.GetObject()!.Handle, false);
var path = file.GetPath() ?? "";
if (File.Exists(path))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<PackageReference Include="xunit" Version="2.6.4" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions NickvisionMoney.Shared/Controllers/AccountViewController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ public async Task StartupAsync()
Name = AccountTitle,
Type = AccountType
});
Aura.Active.SaveConfig("config");
Configuration.Current.Save();
RecentAccountsChanged?.Invoke(this, EventArgs.Empty);
//Groups
foreach (var pair in _account.Groups.OrderBy(x => x.Value.Name == _("Ungrouped") ? " " : x.Value.Name))
Expand Down Expand Up @@ -607,7 +607,7 @@ public void UpdateMetadata(AccountMetadata metadata)
Name = AccountTitle,
Type = AccountType
});
Aura.Active.SaveConfig("config");
Configuration.Current.Save();
RecentAccountsChanged?.Invoke(this, EventArgs.Empty);
if (oldSymbol != metadata.CustomCurrencySymbol || oldStyle != metadata.CustomCurrencyAmountStyle || oldDecimalSeparator != metadata.CustomCurrencyDecimalSeparator || oldGroupSeparator != metadata.CustomCurrencyGroupSeparator || oldDecimalDigits != metadata.CustomCurrencyDecimalDigits)
{
Expand Down
5 changes: 2 additions & 3 deletions NickvisionMoney.Shared/Controllers/MainWindowController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ public MainWindowController(string[] args)
catch (IOException) { }
Directory.Delete($"{UserDirectories.Config}{Path.DirectorySeparatorChar}Nickvision{Path.DirectorySeparatorChar}{AppInfo.Name}", true);
}
Aura.Active.SetConfig<Configuration>("config");
AppInfo.Version = "2024.1.0-next";
AppInfo.ShortName = _("Denaro");
AppInfo.Description = _("Manage your personal finances");
Expand Down Expand Up @@ -148,7 +147,7 @@ public bool ShowGraphs
set
{
Configuration.Current.ShowGraphs = value;
Aura.Active.SaveConfig("config");
Configuration.Current.Save();
}
}

Expand Down Expand Up @@ -378,7 +377,7 @@ public void CloseAccount(int index)
public void RemoveRecentAccount(RecentAccount recentAccount)
{
Configuration.Current.RemoveRecentAccount(recentAccount);
Aura.Active.SaveConfig("config");
Configuration.Current.Save();
RecentAccountsChanged?.Invoke(this, EventArgs.Empty);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,5 +124,5 @@ public string CSVBackupFolder
/// <summary>
/// Saves the configuration to disk
/// </summary>
public void SaveConfiguration() => Aura.Active.SaveConfig("config");
public void SaveConfiguration() => Configuration.Current.Save();
}
2 changes: 1 addition & 1 deletion NickvisionMoney.Shared/Docs/html/nl/account.html
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
<dd class="terms"><p class="p">Each account stores information about the order of transactions in the main window. Every time you change this, it will be saved to the account file and restored when you reopen the account.</p></dd>
<dt class="terms">Groepszichtbaarheid</dt>
<dd class="terms"><p class="p">Each account stores information about whether the groups list in the main window is hidden or not. Every time you change groups list visibility, it's saved and then restored when you reopen the account.</p></dd>
<dt class="terms">Tags Visibility</dt>
<dt class="terms">Label­zichtbaarheid</dt>
<dd class="terms"><p class="p">Each account stores information about whether the tags list in the main window is hidden or not. Every time you change tags list visibility, it's saved and then restored when you reopen the account.</p></dd>
</dl></div></div></div>
</div>
Expand Down
12 changes: 6 additions & 6 deletions NickvisionMoney.Shared/Docs/html/nl/configuration.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
<dd class="terms"><p class="p">A color that will be used for transactions created using <span class="link"><a href="transfer.html" title="Overdracht">transfer</a></span>. Changing this will not affect existing transactions.</p></dd>
<dt class="terms">Standaard­groepskleur</dt>
<dd class="terms"><p class="p">A color that will be selected by default when adding a new group. This is also a color for «Ungrouped» group.</p></dd>
<dt class="terms">Checking Account Color</dt>
<dt class="terms">Kleur van betaal­rekening</dt>
<dd class="terms"><p class="p">A color used to mark <span class="link"><a href="account.html" title="Account">accounts</a></span> with the <span class="em">Checking</span> type in a recent accounts list.</p></dd>
<dt class="terms">Savings Account Color</dt>
<dt class="terms">Kleur van spaar­rekening</dt>
<dd class="terms"><p class="p">A color used to mark <span class="link"><a href="account.html" title="Account">accounts</a></span> with the <span class="em">Savings</span> type in a recent accounts list.</p></dd>
<dt class="terms">Business Account Color</dt>
<dt class="terms">Kleur van bedrijfs­rekening</dt>
<dd class="terms"><p class="p">A color used to mark <span class="link"><a href="account.html" title="Account">accounts</a></span> with the <span class="em">Business</span> type in a recent accounts list.</p></dd>
<dt class="terms">Use Native Digits</dt>
<dt class="terms">Lokale decimale notatie gebruiken</dt>
<dd class="terms"><p class="p">Whether to use numerals that are native for your locale instead of latin digits. For example, if this setting is enabled <span class="em">٠١٢</span> will be used instead of <span class="em">012</span> for locales that use Eastern Arabic numerals.</p></dd>
<dt class="terms">Insert Decimal Separator</dt>
<dt class="terms">Decimaal scheidings­teken invoegen</dt>
<dd class="terms"><p class="p">Set for which keys pressed will the locale's decimal separator be inserted into an amount field: numpad period, any period and comma, or none. If decimal separator is already presented in a field, it will not be inserted.</p></dd>
<dt class="terms">CSV Backup Folder</dt>
<dt class="terms">CSV-back-up­map</dt>
<dd class="terms"><p class="p">A folder where your data will be automatically <span class="link"><a href="import-export.html" title="Importeren/exporteren">exported to CSV</a></span> after every change. This feature doesn't work for password-protected accounts, because CSV files can't be password-protected.</p></dd>
</dl></div></div></div>
</div>
Expand Down
16 changes: 8 additions & 8 deletions NickvisionMoney.Shared/Docs/html/nl/import-export.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@
<li class="list">
<div class="title title-item"><h2><span class="title">RepeatInterval</span></h2></div>
<p class="p">A number representing transaction repeat interval:</p>
<p class="p">0 - Never</p>
<p class="p">1 - Daily</p>
<p class="p">2 - Weekly</p>
<p class="p">7 - Biweekly</p>
<p class="p">3 - Monthly</p>
<p class="p">4 - Quarterly</p>
<p class="p">5 - Yearly</p>
<p class="p">6 - Biyearly</p>
<p class="p">0 - Nooit</p>
<p class="p">1 - Dagelijks</p>
<p class="p">2 - Wekelijks</p>
<p class="p">7 - Twee­wekelijks</p>
<p class="p">3 - Maandelijks</p>
<p class="p">4 - Eén keer per kwartaal</p>
<p class="p">5 - Jaarlijks</p>
<p class="p">6 - Twee­jaarlijks</p>
<p class="p">See <span class="em">Repeat Interval</span> in <span class="link"><a href="transaction.html" title="Transactie">transaction</a></span> page for details about repeat transactions.</p>
</li>
<li class="list">
Expand Down
2 changes: 1 addition & 1 deletion NickvisionMoney.Shared/Docs/html/nl/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}, false);</script><script type="text/javascript" src="../C/yelp.js"></script>
</head>
<body lang="nl" dir="ltr"><main><div class="page">
<header><div class="inner pagewide"></div></header><article><div class="hgroup pagewide"><h1 class="title"><span class="title"><span class="media"><span class="media media-image"><img src="../C/figures/denaro.png" class="media media-inline" alt=""></span></span> Denaro Help</span></h1></div>
<header><div class="inner pagewide"></div></header><article><div class="hgroup pagewide"><h1 class="title"><span class="title"><span class="media"><span class="media media-image"><img src="../C/figures/denaro.png" class="media media-inline" alt=""></span></span> Denaro-hulp</span></h1></div>
<div class="region"><div class="contents pagewide">
<p class="p">This documentation will help you understand how to configure and manage data in <span class="app">Denaro</span> to get the most of the application.</p>
<p class="p">To get support, use <span class="link"><a href="https://github.com/NickvisionApps/Denaro/issues" title="https://github.com/NickvisionApps/Denaro/issues">issues</a></span> or <span class="link"><a href="https://github.com/NickvisionApps/Denaro/discussions" title="https://github.com/NickvisionApps/Denaro/discussions">discussions</a></span> on Github, or <span class="link"><a href="https://bit.ly/3GrfEid" title="https://bit.ly/3GrfEid">join our Matrix channel</a></span>.</p>
Expand Down
2 changes: 1 addition & 1 deletion NickvisionMoney.Shared/Docs/html/nl/transaction.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dd class="terms"><p class="p">Any date can be selected, you can also create transactions for future dates.</p></dd>
<dt class="terms">Herhalingsinterval</dt>
<dd class="terms"><p class="p">Use this option to create a recurring transaction. After you add transaction with repeat interval, this transaction will become a <span class="em">source</span> transaction. <span class="app">Denaro</span> will automatically generate <span class="em">repeat</span> transactions for the dates up until today or a provided end date if set in the past. <span class="em">Repeat</span> transactions can't be edited or deleted, only <span class="em">source</span> can be modified. When you modify <span class="em">source</span> transaction <span class="app">Denaro</span> will ask if you want to modify or disassociate <span class="em">repeat</span> transactions. If you choose to disassociate, <span class="em">repeat</span> transactions become normal transactions and can be edited or deleted separately.</p></dd>
<dt class="terms">Repeat End Date</dt>
<dt class="terms">Einddatum herhalen</dt>
<dd class="terms"><p class="p">End date for a transaction with repeat. It can't be earlier than or on the same day as start date.</p></dd>
<dt class="terms">Groep</dt>
<dd class="terms"><p class="p">Each transaction can belong to only one group or none («Ungrouped» group).</p></dd>
Expand Down
2 changes: 1 addition & 1 deletion NickvisionMoney.Shared/Docs/html/zh_Hans/account.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<dd class="terms"><p class="p">There are 3 account types available: 🟣<span class="em">Checking</span>, 🔵<span class="em">Savings</span> and 🟢<span class="em">Business</span>. Account type is only a useful label that is shown in the list of recent accounts and doesn't affect how the application works or what you can do with an account. Each account type has its own color, these colors can be configured in <span class="link"><a href="configuration.html" title="Configuration">global settings</a></span>.</p></dd>
<dt class="terms">Default Transaction Type</dt>
<dd class="terms"><p class="p">When you create a new transaction its type by default will be the same as in this setting.</p></dd>
<dt class="terms">Transaction Reminders Threshold</dt>
<dt class="terms">交易提醒门槛</dt>
<dd class="terms"><p class="p">The threshold used when showing reminders about upcoming transactions.</p></dd>
<dt class="terms">System Currency</dt>
<dd class="terms">
Expand Down
6 changes: 3 additions & 3 deletions NickvisionMoney.Shared/Docs/html/zh_Hans/configuration.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@
<dd class="terms"><p class="p">A color that will be selected by default when adding a new <span class="link"><a href="transaction.html" title="交易">transaction</a></span> with unique color. Changing this will not affect existing transactions, even if they use previously selected default color.</p></dd>
<dt class="terms">Transfer Default Color</dt>
<dd class="terms"><p class="p">A color that will be used for transactions created using <span class="link"><a href="transfer.html" title="Transfer">transfer</a></span>. Changing this will not affect existing transactions.</p></dd>
<dt class="terms">Group Default Color</dt>
<dt class="terms">群组默认色</dt>
<dd class="terms"><p class="p">A color that will be selected by default when adding a new group. This is also a color for «Ungrouped» group.</p></dd>
<dt class="terms">Checking Account Color</dt>
<dd class="terms"><p class="p">A color used to mark <span class="link"><a href="account.html" title="Account">accounts</a></span> with the <span class="em">Checking</span> type in a recent accounts list.</p></dd>
<dt class="terms">Savings Account Color</dt>
<dd class="terms"><p class="p">A color used to mark <span class="link"><a href="account.html" title="Account">accounts</a></span> with the <span class="em">Savings</span> type in a recent accounts list.</p></dd>
<dt class="terms">Business Account Color</dt>
<dd class="terms"><p class="p">A color used to mark <span class="link"><a href="account.html" title="Account">accounts</a></span> with the <span class="em">Business</span> type in a recent accounts list.</p></dd>
<dt class="terms">Use Native Digits</dt>
<dt class="terms">使用原生数字</dt>
<dd class="terms"><p class="p">Whether to use numerals that are native for your locale instead of latin digits. For example, if this setting is enabled <span class="em">٠١٢</span> will be used instead of <span class="em">012</span> for locales that use Eastern Arabic numerals.</p></dd>
<dt class="terms">Insert Decimal Separator</dt>
<dd class="terms"><p class="p">Set for which keys pressed will the locale's decimal separator be inserted into an amount field: numpad period, any period and comma, or none. If decimal separator is already presented in a field, it will not be inserted.</p></dd>
<dt class="terms">CSV Backup Folder</dt>
<dt class="terms">CVS备份文件夹</dt>
<dd class="terms"><p class="p">A folder where your data will be automatically <span class="link"><a href="import-export.html" title="Import/Export">exported to CSV</a></span> after every change. This feature doesn't work for password-protected accounts, because CSV files can't be password-protected.</p></dd>
</dl></div></div></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion NickvisionMoney.Shared/Docs/html/zh_Hans/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<p class="p">This documentation will help you understand how to configure and manage data in <span class="app">Denaro</span> to get the most of the application.</p>
<p class="p">To get support, use <span class="link"><a href="https://github.com/NickvisionApps/Denaro/issues" title="https://github.com/NickvisionApps/Denaro/issues">issues</a></span> or <span class="link"><a href="https://github.com/NickvisionApps/Denaro/discussions" title="https://github.com/NickvisionApps/Denaro/discussions">discussions</a></span> on Github, or <span class="link"><a href="https://bit.ly/3GrfEid" title="https://bit.ly/3GrfEid">join our Matrix channel</a></span>.</p>
<div class="links topiclinks"><div class="inner"><div class="region"><div class="links-divs">
<div class="linkdiv "><a class="linkdiv" href="account.html" title="Account"><span class="title">Account 🏦</span></a></div>
<div class="linkdiv "><a class="linkdiv" href="configuration.html" title="Configuration"><span class="title">Configuration 🔧</span></a></div>
<div class="linkdiv "><a class="linkdiv" href="import-export.html" title="Import/Export"><span class="title">Import/Export 📤</span></a></div>
<div class="linkdiv "><a class="linkdiv" href="transaction.html" title="交易"><span class="title">Transaction 🧾</span></a></div>
<div class="linkdiv "><a class="linkdiv" href="transfer.html" title="Transfer"><span class="title">Transfer 💸</span></a></div>
<div class="linkdiv "><a class="linkdiv" href="account.html" title="Account"><span class="title">账户</span></a></div>
</div></div></div></div>
</div></div>
<div class="clear"></div></article><footer><div class="inner pagewide"><div class="about ui-expander" role="contentinfo">
Expand Down
2 changes: 1 addition & 1 deletion NickvisionMoney.Shared/Docs/html/zh_Hans/transaction.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dd class="terms"><p class="p">Each transaction can belong to only one group or none («Ungrouped» group).</p></dd>
<dt class="terms">Color</dt>
<dd class="terms"><p class="p">A color for transaction. Can be set to use either a group color or a unique color. When selecting unique color, it will be set by default to the color selected in <span class="link"><a href="configuration.html" title="Configuration">configuration</a></span>, but can be changed to any color.</p></dd>
<dt class="terms">Tags</dt>
<dt class="terms">标签</dt>
<dd class="terms"><p class="p">A list of tags for transaction. A transaction can have unlimited number of tags (or have no tags). Tags can contain any characters except comma (<span class="code">,</span>), and have any length, but they are expected to be short keywords. Tags are meant to be used for additional filtering when using groups is not enough. Tags are only saved in transactions themselves, and as result unused tags disappear automatically on account closing.</p></dd>
<dt class="terms">收据</dt>
<dd class="terms"><p class="p">An image of a receipt for transaction. You can upload JPEG or PNG image or PDF document, but no matter the format it will be converted and saved as JPEG image. In case of PDF, only the first page will be saved. You can delete or upload another file anytime.</p></dd>
Expand Down
2 changes: 1 addition & 1 deletion NickvisionMoney.Shared/Docs/yelp/nl/account.page
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
<p>Each account stores information about whether the groups list in the main window is hidden or not. Every time you change groups list visibility, it's saved and then restored when you reopen the account.</p>
</item>
<item>
<title>Tags Visibility</title>
<title>Label­zichtbaarheid</title>
<p>Each account stores information about whether the tags list in the main window is hidden or not. Every time you change tags list visibility, it's saved and then restored when you reopen the account.</p>
</item>
</terms>
Expand Down
12 changes: 6 additions & 6 deletions NickvisionMoney.Shared/Docs/yelp/nl/configuration.page
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,27 @@
<p>A color that will be selected by default when adding a new group. This is also a color for «Ungrouped» group.</p>
</item>
<item>
<title>Checking Account Color</title>
<title>Kleur van betaal­rekening</title>
<p>A color used to mark <link xref="account">accounts</link> with the <em>Checking</em> type in a recent accounts list.</p>
</item>
<item>
<title>Savings Account Color</title>
<title>Kleur van spaar­rekening</title>
<p>A color used to mark <link xref="account">accounts</link> with the <em>Savings</em> type in a recent accounts list.</p>
</item>
<item>
<title>Business Account Color</title>
<title>Kleur van bedrijfs­rekening</title>
<p>A color used to mark <link xref="account">accounts</link> with the <em>Business</em> type in a recent accounts list.</p>
</item>
<item>
<title>Use Native Digits</title>
<title>Lokale decimale notatie gebruiken</title>
<p>Whether to use numerals that are native for your locale instead of latin digits. For example, if this setting is enabled <em>٠١٢</em> will be used instead of <em>012</em> for locales that use Eastern Arabic numerals.</p>
</item>
<item>
<title>Insert Decimal Separator</title>
<title>Decimaal scheidings­teken invoegen</title>
<p>Set for which keys pressed will the locale's decimal separator be inserted into an amount field: numpad period, any period and comma, or none. If decimal separator is already presented in a field, it will not be inserted.</p>
</item>
<item>
<title>CSV Backup Folder</title>
<title>CSV-back-up­map</title>
<p>A folder where your data will be automatically <link xref="import-export">exported to CSV</link> after every change. This feature doesn't work for password-protected accounts, because CSV files can't be password-protected.</p>
</item>
</terms>
Expand Down
Loading

0 comments on commit 82bbaf5

Please sign in to comment.