Merge pull request #1588 from andreasabeck/passwd-lang

added localisation for encryption dialog & de-DE translation

boot/boot.js

@@ -490,20 +490,28 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
 		children = [dm("h1",{text: options.serviceName})];
 	if(!options.noUserName) {
 		children.push(dm("input",{
-			attributes: {type: "text", name: "username", placeholder: "Username"}
+			attributes: {type: "text", name: "username", placeholder: $tw.language.getString("Encryption/Username")}
 		}));
 	}
 	children.push(dm("input",{
-		attributes: {type: "password", name: "password", placeholder: "Password"}
+		attributes: {
+			type: "password",
+			name: "password",
+			placeholder: ( $tw.language == undefined ? "Password" : $tw.language.getString("Encryption/Password") )
+		}
 	}));
 	if(options.repeatPassword) {
 		children.push(dm("input",{
-			attributes: {type: "password", name: "password2", placeholder: "Repeat password"}
+			attributes: {
+				type: "password",
+				name: "password2",
+				placeholder: $tw.language.getString("Encryption/RepeatPassword")
+			}
 		}));
 	}
 	if(options.canCancel) {
 		children.push(dm("button",{
-			text: "Cancel",
+			text: $tw.language.getString("Encryption/Cancel"),
 			eventListeners: [{
 					name: "click",
 					handlerFunction: function(event) {
@@ -537,7 +545,7 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
 		});
 		// Check that the passwords match
 		if(options.repeatPassword && data.password !== data.password2) {
-			alert("Passwords do not match");
+			alert($tw.language.getString("Encryption/PasswordNoMatch"));
 		} else {
 			// Call the callback
 			if(options.callback(data)) {
@@ -551,7 +559,7 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
 					}
 				});
 			}
-		} 
+		}
 		event.preventDefault();
 		return false;
 	},true);
@@ -1925,9 +1933,9 @@ $tw.boot.isStartupTaskEligible = function(taskModule) {
 Global Hooks mechanism which allows plugins to modify default functionality
 */
 $tw.hooks = $tw.hooks || { names: {}};
- 
+
 /*
-Add hooks to the  hashmap 
+Add hooks to the  hashmap
 */
 $tw.hooks.addHook = function(hookName,definition) {
 	if($tw.utils.hop($tw.hooks.names,hookName)) {
@@ -1937,9 +1945,9 @@ $tw.hooks.addHook = function(hookName,definition) {
 		$tw.hooks.names[hookName] = [definition];
 	}
 };
- 
+
 /*
-Invoke the hook by key 
+Invoke the hook by key
 */
 $tw.hooks.invokeHook = function(hookName, value) {
 	if($tw.utils.hop($tw.hooks.names,hookName)) {

core/language/en-GB/Misc.multids

@@ -10,8 +10,14 @@ ConfirmOverwriteTiddler: Do you wish to overwrite the tiddler "<$text text=<<tit
 ConfirmEditShadowTiddler: You are about to edit a ShadowTiddler. Any changes will override the default system making future upgrades non-trivial. Are you sure you want to edit "<$text text=<<title>>/>"?
 DefaultNewTiddlerTitle: New Tiddler
 DropMessage: Drop here (or use the 'Escape' key to cancel)
+Encryption/Cancel: Cancel
 Encryption/ConfirmClearPassword: Do you wish to clear the password? This will remove the encryption applied when saving this wiki
 Encryption/PromptSetPassword: Set a new password for this TiddlyWiki
+Encryption/Username: Username
+Encryption/Password: Password
+Encryption/RepeatPassword: Repeat password
+Encryption/PasswordNoMatch: Passwords do not match
+Encryption/SetPassword: Set password
 InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`)
 MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" - click {{$:/core/images/edit-button}} to create
 OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library

core/modules/startup/password.js

@@ -23,7 +23,7 @@ exports.startup = function() {
 		$tw.passwordPrompt.createPrompt({
 			serviceName: $tw.language.getString("Encryption/PromptSetPassword"),
 			noUserName: true,
-			submitText: "Set password",
+			submitText: $tw.language.getString("Encryption/SetPassword"),
 			canCancel: true,
 			repeatPassword: true,
 			callback: function(data) {

languages/de-DE/Misc.multids

@@ -10,8 +10,14 @@ ConfirmOverwriteTiddler: Tiddler: "<$text text=<<title>>/>" existiert! OK übers
 ConfirmEditShadowTiddler: Sie sind dabei, einen Schatten-Tiddler zu verändern. Zukünftige, automatische Anpassungen werden dadurch unterdrückt. Sie können Ihre Änderungen rückgängig machen, indem Sie diesen Tiddler wieder löschen. Wollen Sie den Tiddler: "<$text text=<<title>>/>" ändern?
 DefaultNewTiddlerTitle: Neuer Tiddler
 DropMessage: Hierher ziehen (oder Escape um abzubrechen)
+Encryption/Cancel: Abbrechen
 Encryption/ConfirmClearPassword: Wollen Sie das Passwort löschen? Damit wird die Verschlüsselung beim nächsten Speichervorgang abgeschalten!
 Encryption/PromptSetPassword: Der TiddlyWiki Inhalt wird mit dem nächsten Speichern verschlüsselt!
+Encryption/Username: Benutzername
+Encryption/Password: Passwort
+Encryption/RepeatPassword: Passwort wiederholen
+Encryption/PasswordNoMatch: Passwörter stimmen nicht überein
+Encryption/SetPassword: Passwort setzen
 InvalidFieldName: Das Feld: "<$text text=<<fieldName>>/>" enthält illegale Zeichen. Felder müssen klein geschrieben werden. Erlaubte Sonderzeichen sind: Zahlen, Unterstrich (`_`), Minus (`-`) und Punkt (`.`).
 MissingTiddler/Hint: Fehlender Tiddler "<$text text=<<currentTiddler>>/>" - klicken Sie {{$:/core/images/edit-button}} um ihn zu erzeugen.
 OfficialPluginLibrary: Offizielles ~TiddlyWiki Plugin Verzeichnis