Browse Source

improved migration impossible

Tobias Hagemann 5 years ago
parent
commit
206ba4c69a

+ 1 - 1
main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java

@@ -10,7 +10,7 @@ import javax.inject.Inject;
 
 public class MigrationImpossibleController implements FxController {
 
-	private static final String HELP_URI = "https://docs.cryptomator.org/en/latest/help/manual-migration";
+	private static final String HELP_URI = "https://docs.cryptomator.org/en/1.5/help/manual-migration/";
 
 	private final FxApplication fxApplication;
 	private final Stage window;

+ 4 - 2
main/ui/src/main/resources/fxml/migration_impossible.fxml

@@ -29,12 +29,14 @@
 			<Circle styleClass="glyph-icon-red" radius="24"/>
 			<FontAwesome5IconView styleClass="glyph-icon-white" glyph="TIMES" glyphSize="24"/>
 		</StackPane>
-		<VBox spacing="12">
+		<VBox spacing="6">
 			<Label styleClass="label-large" text="%migration.impossible.heading"/>
 			<Label text="%migration.impossible.reason" wrapText="true" HBox.hgrow="ALWAYS"/>
 			<TextFlow>
 				<Text text="%migration.impossible.moreInfo"/>
-				<Hyperlink text="${controller.helpUri}" onAction="#getMigrationHelp"/>
+				<Text text=" "/>
+				<Hyperlink styleClass="hyperlink-underline" text="docs.cryptomator.org" wrapText="true" onAction="#getMigrationHelp"/>
+				<Text text="."/>
 			</TextFlow>
 		</VBox>
 	</HBox>

+ 2 - 2
main/ui/src/main/resources/i18n/strings.properties

@@ -121,8 +121,8 @@ migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=The file system
 migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=The file system does not allow to be written to.
 ## Impossible
 migration.impossible.heading=Unable to migrate vault
-migration.impossible.reason=The vault cannot automatically migrated because its storage location or access point is not compatible.
-migration.impossible.moreInfo=The vault can still be opened with an older version. For instructions how to manually migrate a vault, visit
+migration.impossible.reason=The vault cannot be automatically migrated because its storage location or access point is not compatible.
+migration.impossible.moreInfo=The vault can still be opened with an older version. For instructions on how to manually migrate a vault, visit
 
 # Preferences
 preferences.title=Preferences