Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MNOE-597][Bug][WIP] Missing Conversion #406

Open
wants to merge 4 commits into
base: 1.6
Choose a base branch
from
Open
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/components/dashboard-selector/dropdown.tmpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ <h4 class='dashboard-title'>
<i ng-hide="showChangeDashboardNameBox" class="fa fa-pencil" uib-tooltip="{{'impac.dashboard_selector.dropdown.tooltip.change_name' | translate}}" tooltip-animation="false" tooltip-append-to-body="true" ng-click="toggleChangeDashboardNameBox(dhb)"/>
</div>

<div ng-show="showCreateDashboardButton" class="option create" ng-click="onCreateDashboard()"><i class="fa fa-plus" /> {{ 'impac.dashboard_selector.dropdown.create_dashboard' | translate:{name: dhbLabelName} }}</div>
<div ng-show="showCreateDashboardButton" class="option create" ng-click="onCreateDashboard()"><i class="fa fa-plus" /> {{ 'impac.dashboard_selector.dropdown.create_dashboard' | translate }}</div>
</div>

<div ng-if="showChangeDashboardNameBox" class="change-name">
<p translate translate-values="{name: dhbLabelName}">impac.dashboard_selector.dropdown.change_dashboard_name</p>
<p translate>impac.dashboard_selector.dropdown.change_dashboard_name</p>
<input type="text" class="form-control" id="changeDhbNameInput" ng-model="dashboardToChange.name" ng-keyup="checkAndUpdateDashboardName($event)"/>
<button class="btn btn-sm btn-default" ng-click="hideChangeDashboardNameBox()" translate>impac.dashboard_selector.dropdown.cancel</button>
<button class="btn btn-sm btn-success" style="margin-left: 10px" ng-click="updateDashboardName()" translate>impac.dashboard_selector.dropdown.confirm</button>
Expand All @@ -50,11 +50,11 @@ <h4 class='dashboard-title'>

<button ng-if="isAddWidgetEnabled && isThereADashboard()" ng-click="onDisplayWidgetSelector()" class='btn btn-warning' ng-disabled="isWidgetSelectorShown()" ng-hide="pdfMode"><span class='fa fa-plus'></span> {{'impac.dashboard_selector.dropdown.add_widget' | translate}}</button>

<button ng-if="isAddDhbEnabled" ng-click="onCreateDashboard()" class='btn btn-warning' ng-show="showCreateDashboardButton" ng-hide="pdfMode"><span class='fa fa-pencil-square-o'></span> {{ 'impac.dashboard_selector.dropdown.create_dashboard' | translate:{name: dhbLabelName} }}</button>
<button ng-if="isAddDhbEnabled" ng-click="onCreateDashboard()" class='btn btn-warning' ng-show="showCreateDashboardButton" ng-hide="pdfMode"><span class='fa fa-pencil-square-o'></span> {{ 'impac.dashboard_selector.dropdown.create_dashboard' | translate }}</button>

<div dashboard-settings-pdf-mode ng-if="isThereADashboard() && !isCurrentDashboardEmpty()" />

<button ng-if="isDeleteDhbEnabled && isThereADashboard()" ng-click="deleteDashboardModal.open()" class='btn btn-danger hidden-xs' ng-show="isThereADashboard()" uib-tooltip="{{'impac.dashboard_selector.dropdown.tooltip.delete' | translate:{name: dhbLabelName} }}" ng-hide="pdfMode"><span class='fa fa-trash-o'></span> </button>
<button ng-if="isDeleteDhbEnabled && isThereADashboard()" ng-click="deleteDashboardModal.open()" class='btn btn-danger hidden-xs' ng-show="isThereADashboard()" uib-tooltip="{{'impac.dashboard_selector.dropdown.tooltip.delete' | translate }}" ng-hide="pdfMode"><span class='fa fa-trash-o'></span> </button>
</div>

</div>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="dashboard-settings pdf-mode" ng-if="enabled">
<div ng-hide="pdfMode">
<button ng-click="toggle()" class='btn btn-info' uib-tooltip="Print Dashboard">
<button ng-click="toggle()" class='btn btn-info' uib-tooltip="{{'impac.components.pdf_mode.print_tooltip' | translate }}">
<span class='fa fa-print' />
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<!-- <span ng-if="connector.formatted_date"> - Synced at {{connector.formatted_date}}</span> -->
</div>
<div class="popover-footer" ng-class="{ 'remove-seperator': realtimeSyncing }">
<p>{{'impac.components.sync_apps.all' | translate}} {{realtimeSyncing ? '' : 'other'}} {{'impac.components.sync_apps.applications_are_synced' | translate}}</p>
<p>{{realtimeSyncing ? 'impac.components.sync_apps.all_applications_are_synced' : 'impac.components.sync_apps.all_other_applications_are_synced' | translate }}</p>
</div>
</script>

Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/create.modal.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="modal-header">
<div class="close" type="button" ng-click="instance.close()" >×</div>
<h3 translate translate-values="{name: dhbLabelName}">impac.dashboard.create.create_new_dashboard</h3>
<h3 translate>impac.dashboard.create.create_new_dashboard</h3>
</div>

<div class="modal-body">
Expand Down
6 changes: 3 additions & 3 deletions src/components/dashboard/dashboard.tmpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h3 translate>impac.dashboard.it_looks_like</h3>
<!-- Widgets selection container -->
<div id="widget-selector" uib-collapse="!showWidgetSelector()" ng-if="!customWidgetSelector.path">
<div class="title">
<p class="instruction" translate translate-values="{name: dhbLabelName}">impac.dashboard.select_the_widgets</p>
<p class="instruction" translate>impac.dashboard.select_the_widgets</p>
<span class="widget-added badge" translate>impac.dashboard.widget_added</span>
<i class="fa fa-times-circle close-selector" ng-if="showCloseWidgetSelectorButton()" ng-click="displayWidgetSelector(false)"/>
</div>
Expand Down Expand Up @@ -114,14 +114,14 @@ <h3 translate>impac.dashboard.it_looks_like</h3>
<div class="row top-buffer-4">
<div class="col-md-8 col-md-offset-2">
<div class="info-text">
<p><b translate translate-values="{name: dhbLabelName}">{{dhbErrorsConfig.firstTimeCreated.first}}</b></p>
<p><b translate>{{dhbErrorsConfig.firstTimeCreated.first}}</b></p>
<p translate>{{dhbErrorsConfig.firstTimeCreated.second}}</p>
</div>
</div>
</div>
</div>
<div class="align-center top-buffer-2">
<button ng-click="createDashboardModal.open()" class='btn btn-lg btn-warning'><span class='fa fa-pencil-square-o'></span> {{ 'impac.dashboard.create_a_dashboard' | translate:{name: dhbLabelName} }}</button>
<button ng-click="createDashboardModal.open()" class='btn btn-lg btn-warning'><span class='fa fa-pencil-square-o'></span> {{ 'impac.dashboard.create_a_dashboard' | translate }}</button>
</div>
</div>

Expand Down
6 changes: 3 additions & 3 deletions src/components/kpis-bar/kpis-bar.tmpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<div class="content">
<div class="row title" ng-if="kpis.length == 0 && availableKpis.kpiSelectorHidden">
<div class="col-xs-12 text-center">
<a href="" class="show-dashboard" ng-click="availableKpis.toggle()" ng-show="hasKpiAvailability()" translate translate-values="{name: dhbLabelName}">impac.kpi_bar.you_can_attach</a>
<span class="no-kpi-templates" ng-hide="hasKpiAvailability()" translate translate-values="{name: dhbLabelName}">impac.kpi_bar.no_kpis</span>
<a href="" class="show-dashboard" ng-click="availableKpis.toggle()" ng-show="hasKpiAvailability()" translate>impac.kpi_bar.you_can_attach</a>
<span class="no-kpi-templates" ng-hide="hasKpiAvailability()" translate>impac.kpi_bar.no_kpis</span>
</div>
</div>

Expand All @@ -35,7 +35,7 @@
</div>
<div class="col-xs-9 col-sm-9 kpi-text">
<span class="caption"><strong>{{kpi.name}}</strong></span>
<span class="emphasis" translate translate-values="{name: dhbLabelName}">impac.kpi_bar.add_to_dashboard</span>
<span class="emphasis" translate>impac.kpi_bar.add_to_dashboard</span>
</div>
</div>
</div>
Expand Down
29 changes: 15 additions & 14 deletions src/locales/en-AU.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,20 @@
"impac.widget.settings.tag-filter.add_filter": "Add filter:",
"impac.widget.settings.tag-filter.report_filtered": "*Report is currently tag filtered",

"impac.dashboard_selector.delete_widget.description": "Are you sure you want to delete this {name}?",
"impac.dashboard_selector.delete_widget.description": "Are you sure you want to delete this Dashboard?",
"impac.dashboard_selector.bootstrap_tabs.add_widget": "Add Widget",
"impac.dashboard_selector.bootstrap_tabs.source": "Source:",
"impac.dashboard_selector.delete.delete_dashboard": "Delete {name}",
"impac.dashboard_selector.delete.delete_dashboard": "Delete Dashboard",
"impac.dashboard_selector.delete.delete": "Delete",
"impac.dashboard_selector.delete.cancel": "@:impac.common.action.cancel",
"impac.dashboard_selector.dropdown.source": "Source:",
"impac.dashboard_selector.dropdown.tooltip.change_name": "Change name",
"impac.dashboard_selector.dropdown.create_dashboard": "Create {name}",
"impac.dashboard_selector.dropdown.change_dashboard_name": "Change {name} name:",
"impac.dashboard_selector.dropdown.create_dashboard": "Create Dashboard",
"impac.dashboard_selector.dropdown.change_dashboard_name": "Change Dashboard name:",
"impac.dashboard_selector.dropdown.cancel": "@:impac.common.action.cancel",
"impac.dashboard_selector.dropdown.confirm": "Confirm",
"impac.dashboard_selector.dropdown.add_widget": "@:impac.dashboard_selector.bootstrap_tabs.add_widget",
"impac.dashboard_selector.dropdown.tooltip.delete": "Delete {name}",
"impac.dashboard_selector.dropdown.tooltip.delete": "Delete Dashboard",

"impac.widget.common.top_buttons.delete.title": "Delete widget",
"impac.widget.common.top_buttons.delete.message": "Are you sure you want to delete this widget?",
Expand All @@ -160,7 +160,7 @@
"impac.widget.common.top_buttons.info_popup.info": "Widget info",
"impac.widget.common.time_period_info.to": "As at {dateTo}",
"impac.widget.common.time_period_info.from_to": "From {dateFrom} to {dateTo}",
"impac.widget.common.error_config.first_time_created.first": "It's time to add a {name}!",
"impac.widget.common.error_config.first_time_created.first": "It's time to add a Dashboard!",
"impac.widget.common.error_config.first_time_created.second": "In 2 clicks, you'll be able to visualize how your business is performing.",
"impac.widget.common.error_config.first_time_created.note": "Note: dashboards you create will only be accessible by you. Dashboard sharing across users will be added soon.",
"impac.widget.common.error_config.empty.first": "Now it's time to select the metrics you want to see!",
Expand Down Expand Up @@ -198,9 +198,9 @@
"impac.kpi.below": "@:impac.widget.settings.attach_kpis.below",
"impac.kpi.extra_param_label.verb": "Select",

"impac.kpi_bar.you_can_attach": "Click to attach KPIs to your {name}",
"impac.kpi_bar.no_kpis": "No KPIs are available for your {name}",
"impac.kpi_bar.add_to_dashboard": "Add to {name}",
"impac.kpi_bar.you_can_attach": "Click to attach KPIs to your Dashboard",
"impac.kpi_bar.no_kpis": "No KPIs are available for your Dashboard",
"impac.kpi_bar.add_to_dashboard": "Add to Dashboard",
"impac.kpi_bar.new": "New!",

"impac.widget.accounting_values.turnover.settings.title": "@:impac.common.title.widget.settings.title",
Expand Down Expand Up @@ -640,7 +640,7 @@
"impac.widget.editable_title.tooltip_text": "(click to edit name)",
"impac.widget.editable_title.incorrect_name": "Incorrect name",

"impac.dashboard.create.create_new_dashboard": "Create New {name}",
"impac.dashboard.create.create_new_dashboard": "Create New Dashboard",
"impac.dashboard.create.name": "Name",
"impac.dashboard.create.rename": "Rename",
"impac.dashboard.create.type": "Type",
Expand All @@ -661,15 +661,15 @@
"impac.dashboard.myob_message.part_2": "MYOB AccountRight",
"impac.dashboard.myob_message.part_3": ", the other MYOB accounting solution?",
"impac.dashboard.widget_added": "Widget added!",
"impac.dashboard.select_the_widgets": "Select the widgets you want to add to your {name}.",
"impac.dashboard.select_the_widgets": "Select the widgets you want to add to your Dashboard.",
"impac.dashboard.all_categories": "All categories",
"impac.dashboard.accounting": "Accounting",
"impac.dashboard.invoicing": "Invoicing",
"impac.dashboard.hr_or_payroll": "HR / Payroll",
"impac.dashboard.sales": "Sales",
"impac.dashboard.can_not_find": "Can't find the widget you're looking for?",
"impac.dashboard.give_us": "Give us your suggestions here!",
"impac.dashboard.create_a_dashboard": "Create a {name}!",
"impac.dashboard.create_a_dashboard": "Create a Dashboard!",
"impac.dashboard.add_new_widget": "Add a new Widget",
"impac.dashboard.plus_chart": "+ chart",
"impac.dashboard.refresh": "Refresh",
Expand Down Expand Up @@ -733,6 +733,7 @@
"impac.components.currency.choose_currency": "Choose currency...",

"impac.components.pdf_mode.print": "Print",
"impac.components.pdf_mode.print_tooltip": "Print Dashboard",
"impac.components.pdf_mode.cancel": "@:impac.common.action.cancel",

"impac.components.sync_apps.syncing": "Syncing...",
Expand All @@ -744,8 +745,8 @@
"impac.components.sync_apps.status.sync_failed": "Sync failed. Please contact support.",
"impac.components.sync_apps.status.please_link": "Please link your application.",
"impac.components.sync_apps.status.could_not_retrieve": "Couldn't retrieve sync status.",
"impac.components.sync_apps.all": "All",
"impac.components.sync_apps.applications_are_synced": "applications are synced in real-time.",
"impac.components.sync_apps.all_applications_are_synced": "All applications are synced in real-time.",
"impac.components.sync_apps.all_other_applications_are_synced": "All other applications are synced in real-time.",
"impac.components.sync_apps.synchronization_status": "Synchronization status",
"impac.components.sync_apps.ok": "OK"
}
Loading