Skip to content

Commit

Permalink
Improve token modal messages (merge commit)
Browse files Browse the repository at this point in the history
Merge branch 'feature/improve-decryption-messaging' into 'main'
* improve finnish decryption message wording

* bump version message for Februaury

* Improve token modal messages

Closes #1254
See merge request https://gitlab.ci.csc.fi/sds-dev/sd-connect/swift-browser-ui/-/merge_requests/399

Reviewed-by: Joonatan Mäkinen <jmakine@csc.fi>
Approved-by: Joonatan Mäkinen <jmakine@csc.fi>
Co-authored-by: Sampsa Penna <sampsa.penna@csc.fi>
Merged by Joonatan Mäkinen <jmakine@csc.fi>
  • Loading branch information
Joonatan Mäkinen committed Feb 11, 2025
2 parents 184afc2 + 597f3cb commit 6502c1a
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 13 deletions.
10 changes: 10 additions & 0 deletions .github/config/.finnishwords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ aika
aikana
aina
ajaksi
aktiiviset
alapuolisesta
alaviiva
alikansio
Expand Down Expand Up @@ -55,8 +56,10 @@ epäonnistui
epäonnistunut
epäonnistuttiin
erikoismerkkejä
erikoismerkkien
erikseen
erillinen
erillisen
erissä
erityyppisiä
esim
Expand Down Expand Up @@ -161,6 +164,7 @@ jos
joskus
jota
jotka
jotkin
julkinen
julkiset
julkisia
Expand Down Expand Up @@ -405,6 +409,7 @@ ne
niiden
niin
nimellä
nimen
nimet
nimetä
nimeä
Expand Down Expand Up @@ -570,6 +575,7 @@ projektitunnukset
pudota
pudotusvalikoissa
puhelin
purettava
purkaa
purkaminen
puutteen
Expand Down Expand Up @@ -630,6 +636,7 @@ salasanasta
salataan
salattua
salauksen
salauksenpurun
salaus
salausavaimia
salausohjelma
Expand Down Expand Up @@ -844,6 +851,7 @@ uusi
uusia
vaatii
vaatimusten
vaativat
vaihda
vaihtaa
vaihto
Expand Down Expand Up @@ -907,6 +915,7 @@ vuoksi
vähintään
väliaikaiseen
väliaikaisten
vältä
yhdelle
yhden
yhdistetty
Expand All @@ -919,6 +928,7 @@ yhteystiedot
yhteyttä
yhtään
yksikkö
yksilöllinen
yksityinen
yksityisen
yksityisestä
Expand Down
2 changes: 1 addition & 1 deletion docs/_static/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ openapi: "3.0.3"
info:
title: "Swift Browser UI"
description: "API for querying Openstack Swift as well as working with Openstack Swift ACLs in order to enable sharing action."
version: "2024.10.2"
version: "2025.2.0"
license:
name: MIT
tags:
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
author = "CSC Developers"

# The full version, including alpha/beta/rc tags
version = release = "2024.10.2"
version = release = "2025.2.0"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion swift_browser_ui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"""

__name__ = "swift_browser_ui"
__version__ = "2024.10.2"
__version__ = "2025.2.0"
__author__ = "CSC Developers"
__license__ = "MIT License"
2 changes: 1 addition & 1 deletion swift_browser_ui_frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "swift_browser_ui_frontend_npm",
"version": "2024.10.2",
"version": "2025.2.0",
"private": true,
"scripts": {
"serve": "./build_wasm.sh && vite serve --mode development",
Expand Down
23 changes: 15 additions & 8 deletions swift_browser_ui_frontend/src/common/lang.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ let default_translations = {
copysuccess: "Copying in progress",
copytime: "It may take few seconds",
copyfail: "Failed to copy the folder",
notDecryptable: "Some requested files could not be decrypted.",
notDecryptable: "Some downloaded files need manual decryption.",
tagName: "Tags (optional)",
tagPlaceholder: "# Add a tag and press enter",
container_ops: {
Expand Down Expand Up @@ -296,8 +296,10 @@ let default_translations = {
tokens: {
empty: "No API tokens created for the project",
title: "Create API tokens",
identifier: "Token identifier",
identLabel: "Insert new token identifier",
identifier: "Active tokens for this project",
identLabel: "Name of the new token",
identHint:
"Token name needs to be unique. Please avoid special characters.",
createToken: "Create token",
latestToken: "Latest token: ",
copy: "Copy token",
Expand All @@ -310,7 +312,7 @@ let default_translations = {
"will be deleted after this time period.",
tokenCopied: "Token copied.",
tokenRemoved: "Token removed.",
inUse: "Token identifier already in use.",
inUse: "Token name already in use.",
creationFailed: "Token creation failed.",
},
encrypt: {
Expand Down Expand Up @@ -789,7 +791,9 @@ let default_translations = {
copysuccess: "Kansiota kopioidaan",
copytime: "Se voi kestää muutaman sekunnin",
copyfail: "Kansion kopiointi epäonnistui",
notDecryptable: "Salauksen purkaminen epäonnistui osassa tiedostoja.",
notDecryptable:
"Joidenkin tiedostojen salaus on purettava erikseen latauksen " +
"jälkeen.",
tagName: "Asiasanat",
tagPlaceholder: "# Lisää asiasana ja paina rivinvaihtoa",
container_ops: {
Expand Down Expand Up @@ -843,8 +847,11 @@ let default_translations = {
tokens: {
empty: "Tälle projektille ei ole luotu API-avaimia",
title: "Luo API-avaimia",
identifier: "Avainten tunnisteet",
identLabel: "Syötä tunniste uudelle API-avaimelle",
identifier: "Tämän projektin aktiiviset API-avaimet",
identLabel: "Uuden avaimen nimi",
identHint:
"Avaimen nimen on oltava yksilöllinen. Vältä erikoismerkkien " +
"käyttöä.",
createToken: "Luo avain",
latestToken: "Viimeisin avain: ",
copy: "Kopioi avain",
Expand All @@ -858,7 +865,7 @@ let default_translations = {
tokenCopied: "Avain kopioitu.",
tokenRemoved: "Avain poistettu.",
creationFailed: "Avaimen luonti epäonnistui.",
inUse: "Avaimen tunniste on jo käytössä.",
inUse: "Avaimen nimi on jo käytössä.",
},
encrypt: {
uploadFiles: "Lataa tiedostoja",
Expand Down
3 changes: 2 additions & 1 deletion swift_browser_ui_frontend/src/components/TokenModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
v-model="newIdentifier"
v-csc-control
name="newIdentifier"
:hint="$t('message.tokens.identHint')"
:label="$t('message.tokens.identLabel')"
/>
<c-button
Expand Down Expand Up @@ -358,7 +359,7 @@ export default {
#create-token-button {
width: max-content;
margin-top: -2rem;
margin-top: -1rem;
}
#token {
Expand Down

0 comments on commit 6502c1a

Please sign in to comment.