Replaced TextFlows by FormattedLabel if applicable

This commit is contained in:
Sebastian Stenzel
2019-08-28 11:42:26 +02:00
parent 6721baf293
commit 1ef8668c4d
2 changed files with 3 additions and 9 deletions

View File

@@ -7,9 +7,8 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Region?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?>
<?import javafx.scene.text.TextFlow?>
<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
<?import org.cryptomator.ui.controls.FormattedLabel?>
<?import org.cryptomator.ui.controls.PasswordStrengthIndicator?>
<?import org.cryptomator.ui.controls.SecPasswordField?>
<VBox xmlns="http://javafx.com/javafx"
@@ -22,12 +21,7 @@
<Insets bottom="12.0" left="12.0" right="12.0" top="12.0"/>
</padding>
<children>
<TextFlow styleClass="text-flow">
<Text text="%changepassword.enterOldPassword"/>
<Text text=" &quot;"/>
<Text text="${controller.vault.displayableName}"/>
<Text text="&quot;"/>
</TextFlow>
<FormattedLabel format="%changepassword.enterOldPassword" arg1="${controller.vault.displayableName}" wrapText="true"/>
<SecPasswordField fx:id="oldPasswordField"/>
<Region prefHeight="36" VBox.vgrow="NEVER"/>

View File

@@ -41,7 +41,7 @@ removeVault.information=No files will be delted from your hard drive.
# Change Password
changepassword.title=Change Password
changepassword.enterOldPassword=Enter the current password for
changepassword.enterOldPassword=Enter the current password for "%s"
changepassword.enterNewPassword=Enter a new password for your vault
changepassword.reenterNewPassword=Confirm the new password
changepassword.passwordsMatch=Passwords match!