IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

Browse Source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
James Cole 2020-08-02 15:49:44 +02:00
commit a22e757502
No known key found for this signature in database
GPG Key ID: B5669F9493CDE38D
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/lang/en_US/firefly.php
View File

@ -574,7 +574,6 @@ return [
'pref_languages_help' => 'Firefly III supports several languages. Which one do you prefer?',
'pref_locale_help' => 'Firefly III allows you to set other local settings, like how currencies, numbers and dates are formatted. Entries in this list may not be supported by your system. Firefly III doesn\'t have the correct date settings for every locale; contact me for improvements.',
'pref_locale_no_windows' => 'This feature may not work on Windows.',
'pref_locale_no_docker' => 'The Docker image only has a small set of installed locales.',
'pref_locale_no_demo' => 'This feature won\'t work for the demo user.',
'pref_custom_fiscal_year' => 'Fiscal year settings',
'pref_custom_fiscal_year_label' => 'Enabled',

1
resources/views/v1/preferences/index.twig
View File

@ -73,7 +73,6 @@
{% if IS_DEMO_SITE %}<li class="text-danger">{{ 'pref_locale_no_demo'|_ }}</li>{% endif %}
<li>{{ 'pref_locale_no_windows'|_ }}</li>
<li>{{ 'pref_locale_no_docker'|_ }}</li>
</ul>
</div>
{% else %}