diff options
| -rw-r--r-- | src/js/Helper/ServerRequirementCheck.js | 7 | ||||
| -rw-r--r-- | src/platform/generic/_locales/de/messages.json | 12 | ||||
| -rw-r--r-- | src/platform/generic/_locales/en/messages.json | 10 |
3 files changed, 23 insertions, 6 deletions
diff --git a/src/js/Helper/ServerRequirementCheck.js b/src/js/Helper/ServerRequirementCheck.js index d450191..d343a05 100644 --- a/src/js/Helper/ServerRequirementCheck.js +++ b/src/js/Helper/ServerRequirementCheck.js @@ -32,7 +32,7 @@ export default class ServerRequirementCheck { setting = collection.get(0); if(setting.getValue() === null || !this._versionCompare(setting.getValue())) { - if(disable) await this._disableServer(); + if(disable) await this._disableServer(setting.getValue()); return false; } @@ -49,17 +49,18 @@ export default class ServerRequirementCheck { * @return {Promise<void>} * @private */ - async _disableServer() { + async _disableServer(serverVersion) { let server = this._api.getServer(); server.setEnabled(false); server.setStatus(server.STATUS_DISABLED); await ServerRepository.update(server); + let minVersion = this.MINIMUM_APP_VERSION.join('.'); let toast = new Toast() .setTitle('ToastServerCheckTitle') .setMessage('ToastServerCheckMessage') .setTitleVars([server.getLabel()]) - .setMessageVars([server.getLabel()]) + .setMessageVars([server.getLabel(), minVersion, serverVersion]) .setType('error') .setTags([this._api.getServer().getId(), 'server-error']) .setTtl(0); diff --git a/src/platform/generic/_locales/de/messages.json b/src/platform/generic/_locales/de/messages.json index 94433cd..2805954 100644 --- a/src/platform/generic/_locales/de/messages.json +++ b/src/platform/generic/_locales/de/messages.json @@ -478,12 +478,20 @@ } }, "ToastServerCheckMessage" : { - "message" : "The account \"$SERVER$\" verwendet einen Server auf dem eine veraltete Version von Passwörter installiert ist. Der Server muss aktualisiert werden bevor das Konto in den Einstellungen erneut aktiviert werden kann.", + "message" : "Das Konto \"$SERVER$\" verwendet Passwörter $SERVERVERSION$, diese Extension benötigt mindestens $MINVERSION$. Die App muss aktualisiert werden bevor das Konto in den Einstellungen erneut aktiviert werden kann.", "description" : "Text of the toast notification when an account was disabled because the server uses an outdated and unsupported version of the passwords app", "placeholders": { - "server": { + "server" : { "content": "$1", "example": "My Nextcloud" + }, + "minversion" : { + "content": "$2", + "example": "2020.1" + }, + "serverversion": { + "content": "$3", + "example": "2020.3" } } }, diff --git a/src/platform/generic/_locales/en/messages.json b/src/platform/generic/_locales/en/messages.json index ca065d3..c63441d 100644 --- a/src/platform/generic/_locales/en/messages.json +++ b/src/platform/generic/_locales/en/messages.json @@ -492,12 +492,20 @@ } }, "ToastServerCheckMessage" : { - "message" : "The account \"$SERVER$\" uses a server running an outdated version of passwords. The server must be updated before the account can be reactivated in the extension settings.", + "message" : "The account \"$SERVER$\" uses passwords $SERVERVERSION$, but this extension requires at least $MINVERSION$. The app needs to be updated before the account can be activated again in the settings.", "description" : "Text of the toast notification when an account was disabled because the server uses an outdated and unsupported version of the passwords app", "placeholders": { "server": { "content": "$1", "example": "My Nextcloud" + }, + "minversion" : { + "content": "$2", + "example": "2020.1" + }, + "serverversion": { + "content": "$3", + "example": "2020.3" } } }, |