diff --git a/public/js/ff/intro/intro.js b/public/js/ff/intro/intro.js index a6e2bdfa99..8d5af27e0e 100644 --- a/public/js/ff/intro/intro.js +++ b/public/js/ff/intro/intro.js @@ -18,8 +18,7 @@ * along with Firefly III. If not, see . */ -/** global: routeForTour, token, routeStepsUri, routeForFinishedTour, forceDemoOff */ - +/** global: nextLabel, prevLabel,skipLabel,doneLabel routeForTour, token, routeStepsUri, routeForFinishedTour, forceDemoOff */ $(function () { "use strict"; if (!forceDemoOff) { @@ -31,6 +30,10 @@ function setupIntro(steps) { var intro = introJs(); intro.setOptions({ + nextLabel: nextLabel, + prevLabel: prevLabel, + skipLabel: skipLabel, + doneLabel: doneLabel, steps: steps, exitOnEsc: true, exitOnOverlayClick: true, diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 1ad9588c50..2dc625165c 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -112,6 +112,10 @@ return [ 'multi_select_n_selected' => 'selected', 'multi_select_all_selected' => 'All selected', 'multi_select_filter_placeholder' => 'Find..', + 'intro_next_label' => 'Next', + 'intro_prev_label' => 'Previous', + 'intro_skip_label' => 'Skip', + 'intro_done_label' => 'Done', 'between_dates_breadcrumb' => 'Between :start and :end', 'all_journals_without_budget' => 'All transactions without a budget', 'journals_without_budget' => 'Transactions without a budget', diff --git a/resources/lang/en_US/import.php b/resources/lang/en_US/import.php index fb584a02e4..fd96266f25 100644 --- a/resources/lang/en_US/import.php +++ b/resources/lang/en_US/import.php @@ -159,5 +159,9 @@ return [ 'spectre_accounts_title' => 'Select accounts to import from', 'spectre_accounts_text' => 'Each account on the left below has been found by Spectre and can be imported into Firefly III. Please select the asset account that should hold any given transactions. If you do not wish to import from any particular account, remove the check from the checkbox.', 'spectre_do_import' => 'Yes, import from this account', + + + // various other strings: + 'imported_from_account' => 'Imported from ":account"', ]; diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index f39e95761a..4e3cfa0de4 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -191,6 +191,10 @@ {% if not shownDemo %}