Skip to content

Commit

Permalink
fix: user facing "username"/"public key" -> SSB-ID
Browse files Browse the repository at this point in the history
  • Loading branch information
decentral1se committed Apr 6, 2022
1 parent 830b0b4 commit 6c93b00
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions web/i18n/defaults/active.de.toml
Expand Up @@ -62,8 +62,8 @@ AuthWithSSBError = "Anmeldung fehlgeschlagen. Stelle sicher, dass du eine SSB-Ap

# auth with password
AuthFallbackTitle = "Mit Passwort anmelden"
AuthFallbackWelcome = "Eine Anmeldung mit Benutzername und Passwort ist nur möglich, wenn der Administrator dir einen solchen Zugang gegeben hat."
AuthFallbackInstruct = "Alternative Anmeldemethode, falls du einen Benutzernamen und ein Passwort hast."
AuthFallbackWelcome = "Eine Anmeldung mit SSB-ID und Passwort ist nur möglich, wenn der Administrator dir einen solchen Zugang gegeben hat."
AuthFallbackInstruct = "Alternative Anmeldemethode, falls du eine SSB-ID und ein Passwort hast."

AuthFallbackNewPassword="Neues Passwort"
AuthFallbackRepeatPassword="Passwort wiederholen"
Expand Down
10 changes: 5 additions & 5 deletions web/i18n/defaults/active.en.toml
Expand Up @@ -35,7 +35,7 @@ NavAdminNotices = "Notices"
# Error messages
ErrorAuthBadLogin = "The supplied authentication credentials (username or password) are incorrect."
ErrorNotFound = "The database couldn't find the item in question."
ErrorAlreadyAdded = "The public key <strong>{{.Key}}</strong> already is on the list"
ErrorAlreadyAdded = "The SSB-ID <strong>{{.Key}}</strong> already is on the list"
ErrorPageNotFound = "The requested page <strong>({{.Path}})</strong> is not there."
ErrorNotAuthorized = "You are not authorized to access this page."
ErrorForbidden = "The request could not be executed because of lacking privileges ({{.Details}})"
Expand All @@ -60,14 +60,14 @@ AuthSignOut = "Sign out"
# auth with ssb
AuthWithSSBTitle = "Sign in with SSB"
AuthWithSSBInstruct = "Easy and secure method, if your SSB app supports it."
AuthWithSSBWelcome = "To sign-in with your SSB identity stored on this device, press the button below which will open a compatible SSB app, if it's installed."
AuthWithSSBInstructQR = "If your SSB app is on another device, you can scan the following QR code to sign-in with that device's SSB identity."
AuthWithSSBWelcome = "To sign-in with your SSB-ID stored on this device, press the button below which will open a compatible SSB app, if it's installed."
AuthWithSSBInstructQR = "If your SSB app is on another device, you can scan the following QR code to sign-in with that device's SSB-ID."
AuthWithSSBError = "Sign-in failed. Please make sure you use an SSB app that supports this method of login, and click the button above within a minute after this page was opened."

# auth with password
AuthFallbackTitle = "Password sign-in"
AuthFallbackWelcome = "Signing in with username and password is only possible if the administrator has given you one, because we do not support user registration."
AuthFallbackInstruct = "This method is an acceptable fallback, if you have a username and password."
AuthFallbackWelcome = "Signing in with SSB-ID and password is only possible if the administrator has given you one, because we do not support user registration."
AuthFallbackInstruct = "This method is an acceptable fallback, if you have a SSB-ID and password."

AuthFallbackNewPassword="New Password"
AuthFallbackRepeatPassword="Repeat Password"
Expand Down
2 changes: 1 addition & 1 deletion web/templates/auth/fallback_sign_in.tmpl
Expand Up @@ -19,7 +19,7 @@ SPDX-License-Identifier: CC-BY-4.0
>
{{ .csrfField }}
<div class="flex flex-col w-48">
<label class="mt-8 text-sm text-gray-600">Username</label>
<label class="mt-8 text-sm text-gray-600">SSB Identifier</label>
<input type="text" name="user"
class="shadow rounded border border-transparent h-8 p-1 focus:outline-none focus:ring-2 focus:ring-green-400 focus:border-transparent">
<label class="mt-8 text-sm text-gray-600">Password</label>
Expand Down

0 comments on commit 6c93b00

Please sign in to comment.