Skip to content

Commit

Permalink
Merge pull request #952 from oslokommune/button-cleanup
Browse files Browse the repository at this point in the history
Use shorter labels for certain buttons
  • Loading branch information
simenheg authored Dec 21, 2023
2 parents 2aee9e4 + 52b4422 commit 76a1e2d
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
1 change: 1 addition & 0 deletions src/components/panes/ObjectivePane.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<pkt-button
v-if="hasEditRights || isMemberOfChild"
:text="$t('general.keyResult')"
:aria-label="$t('btn.addKeyResult')"
skin="primary"
size="small"
variant="icon-left"
Expand Down
3 changes: 2 additions & 1 deletion src/components/panes/TimelinePane.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
<template #actions>
<pkt-button
v-if="hasEditRights"
:text="$t('btn.createObjective')"
:text="$t('general.objective')"
:aria-label="$t('btn.createObjective')"
skin="primary"
size="small"
variant="icon-left"
Expand Down
5 changes: 4 additions & 1 deletion src/components/widgets/WidgetKpiProgressGraph.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,17 @@
skin="primary"
variant="icon-left"
icon-name="plus-sign"
:aria-label="$t('kpi.newValue')"
@onClick="$emit('add-value')"
>
{{ $t('kpi.newValue') }}
{{ $t('kpi.value') }}
</pkt-button>
<pkt-button
size="small"
skin="tertiary"
variant="icon-left"
icon-name="bullseye"
:aria-label="$t('kpi.goals.set')"
@onClick="$emit('set-goals')"
>
{{ $t('kpi.goals.set') }}
Expand All @@ -28,6 +30,7 @@
skin="tertiary"
variant="icon-left"
icon-name="download"
:aria-label="$t('dashboard.downloadOptions.png')"
@onClick="download"
>
{{ $t('btn.download') }}
Expand Down
4 changes: 2 additions & 2 deletions src/locale/locales/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"currentValue": "Current value",
"latestValueTitle": "Latest value per {formattedDate}",
"progress": "Progress",
"value": "Value",
"newValue": "New value",
"editValue": "Edit value",
"description": "Description",
Expand Down Expand Up @@ -166,6 +167,7 @@
"OKRs": "OKRs",
"OKRsLong": "Objectives and Key results",
"OKRsLonger": "Objectives and Key results for {name}",
"KPI": "Measurement",
"KPIs": "Measurements",
"KPIsLong": "Measurements for {name}",
"project": "OKR",
Expand Down Expand Up @@ -207,8 +209,6 @@
"displayedAs": "Displayed as: ",
"today": "Today",
"view": "View",
"newObjective": "New objective",
"newKeyResult": "New key result",
"step": "Step {step} of {steps}",
"or": "or",
"shortcuts": "Shortcuts",
Expand Down
4 changes: 2 additions & 2 deletions src/locale/locales/nb-NO.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"currentValue": "Nåværende verdi",
"latestValueTitle": "Siste verdi per {formattedDate}",
"progress": "Progresjon",
"value": "Målepunkt",
"newValue": "Legg til målepunkt",
"editValue": "Endre målepunkt",
"description": "Beskrivelse",
Expand Down Expand Up @@ -166,6 +167,7 @@
"OKRs": "OKR-er",
"OKRsLong": "Mål og nøkkelresultater",
"OKRsLonger": "Mål og nøkkelresultater for {name}",
"KPI": "Måling",
"KPIs": "Målinger",
"KPIsLong": "Målinger for {name}",
"project": "OKR",
Expand Down Expand Up @@ -207,8 +209,6 @@
"displayedAs": "Vises som: ",
"today": "I dag",
"view": "Visning",
"newObjective": "Nytt mål",
"newKeyResult": "Nytt nøkkelresultat",
"step": "Steg {step} av {steps}",
"or": "eller",
"shortcuts": "Snarveier",
Expand Down
3 changes: 2 additions & 1 deletion src/views/Item/ItemMeasurements.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@

<div v-if="hasEditRights" class="measurements-page__actions">
<pkt-button
:text="$t('admin.measurement.new')"
:text="$t('general.KPI')"
:aria-label="$t('admin.measurement.new')"
skin="primary"
size="small"
variant="icon-left"
Expand Down

0 comments on commit 76a1e2d

Please sign in to comment.