From fe9479e3f35004f0f387a5f0331c504c54ee4cb3 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Thu, 31 Dec 2020 13:01:00 +0100 Subject: [PATCH] #562 - link to wiki for remote git configuration help --- src/main/resources/languages/base_de.properties | 2 ++ src/main/resources/languages/base_en.properties | 2 ++ src/main/resources/templates/settings/settingsMacros.ftl | 6 +++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties index a17657e9f..554b1f106 100644 --- a/src/main/resources/languages/base_de.properties +++ b/src/main/resources/languages/base_de.properties @@ -209,6 +209,8 @@ settings.backup.auto.strategy.none=Keine settings.backup.auto.strategy.local=Kopien im Dateisystem settings.backup.auto.strategy.git.local=Lokales git repository settings.backup.auto.strategy.git.remote=Entferntes git repository +settings.backup.auto.strategy.git.remote.help=Einrichtungshilfe +settings.backup.auto.strategy.git.remote.help.url=https://github.com/deadlocker8/BudgetMaster/wiki/Automatic-backup settings.backup.auto.files.to.keep=Anzahl aufzubewahrender Backups (0 für unbegrenzt) settings.backup.auto.next=Nächste Ausführung settings.backup.auto.has.errors=Letztes Backup diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties index eade68523..257009a02 100644 --- a/src/main/resources/languages/base_en.properties +++ b/src/main/resources/languages/base_en.properties @@ -209,6 +209,8 @@ settings.backup.auto.strategy.local=File system copies settings.backup.auto.strategy.none=None settings.backup.auto.strategy.git.local=Local git repository settings.backup.auto.strategy.git.remote=Remote git repository +settings.backup.auto.strategy.git.remote.help=Configuration help +settings.backup.auto.strategy.git.remote.help.url=https://github.com/deadlocker8/BudgetMaster/wiki/Automatic-backup settings.backup.auto.files.to.keep=Number of backups to keep (0 for unlimited) settings.backup.auto.next=Next execution settings.backup.auto.has.errors=Last backup diff --git a/src/main/resources/templates/settings/settingsMacros.ftl b/src/main/resources/templates/settings/settingsMacros.ftl index 6f54de268..58863b124 100644 --- a/src/main/resources/templates/settings/settingsMacros.ftl +++ b/src/main/resources/templates/settings/settingsMacros.ftl @@ -261,8 +261,12 @@ <label for="settings-backup-auto-git-token">${locale.getString("settings.backup.auto.git.token")}</label> </div> - <div class="col s12 m12 l8 offset-l2"> + <div class="col s6 m6 l4 offset-l2"> <a id="settings-backup-auto-git-test" data-url="<@s.url '/settings/git/test'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">send</i>${locale.getString("settings.backup.auto.git.test")}</a> </div> + + <div class="col s6 m6 l4 right-align"> + <a target="_blank" href="${locale.getString("settings.backup.auto.strategy.git.remote.help.url")}" class="waves-effect waves-light btn btn-flat text-color"><i class="material-icons left">help_outline</i>${locale.getString("settings.backup.auto.strategy.git.remote.help")}</a> + </div> </div> </#macro> \ No newline at end of file -- GitLab