diff options
| author | GeckoEidechse <gecko.eidechse+git@pm.me> | 2023-07-21 12:15:50 +0200 |
|---|---|---|
| committer | GeckoEidechse <gecko.eidechse+git@pm.me> | 2023-07-21 12:15:50 +0200 |
| commit | 17d6282d832ef3a697e2f234aff9d03e55aca27a (patch) | |
| tree | 0e0deb5ef53fb595d78a1f0582fa04f7501b7075 | |
| parent | c5bffe6b02a5bd61cff4d973d49f5250d1fd738b (diff) | |
| parent | 99920002511676f55b8a45e51b5c735f50db4bd6 (diff) | |
| download | FlightCore-17d6282d832ef3a697e2f234aff9d03e55aca27a.tar.gz FlightCore-17d6282d832ef3a697e2f234aff9d03e55aca27a.zip | |
Merge branch 'main' into dev/packages
| -rw-r--r-- | src-tauri/src/github/release_notes.rs | 15 | ||||
| -rw-r--r-- | src-vue/src/i18n/lang/pl.json | 9 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src-tauri/src/github/release_notes.rs b/src-tauri/src/github/release_notes.rs index 6db5b617..16b65183 100644 --- a/src-tauri/src/github/release_notes.rs +++ b/src-tauri/src/github/release_notes.rs @@ -58,14 +58,17 @@ pub async fn get_newest_flightcore_version() -> Result<FlightCoreVersion, String #[tauri::command] pub async fn check_is_flightcore_outdated() -> Result<bool, String> { let newest_flightcore_release = get_newest_flightcore_version().await?; + // Parse version number excluding leading `v` + let newest_version = semver::Version::parse(&newest_flightcore_release.tag_name[1..]).unwrap(); - // Get version of installed FlightCore... - let version = env!("CARGO_PKG_VERSION"); - // ...and format it - let version = format!("v{}", version); + // Get version of installed FlightCore + let current_version = env!("CARGO_PKG_VERSION"); + let current_version = semver::Version::parse(current_version).unwrap(); - // TODO: This shouldn't be a string compare but promper semver compare - let is_outdated = version != newest_flightcore_release.tag_name; + #[cfg(debug_assertions)] + let is_outdated = current_version < newest_version; + #[cfg(not(debug_assertions))] + let is_outdated = current_version != newest_version; // If outdated, check how new the update is if is_outdated { diff --git a/src-vue/src/i18n/lang/pl.json b/src-vue/src/i18n/lang/pl.json index c9c632b7..f13d9ae3 100644 --- a/src-vue/src/i18n/lang/pl.json +++ b/src-vue/src/i18n/lang/pl.json @@ -107,11 +107,16 @@ "reinstall_text": "Proszę czekać", "reinstall_success": "Pomyślnie przeinstalowano Northstar", "title": "Okno naprawy FlightCore", - "warning": "To okno zawiera różne funkcje do naprawy typowych problemów z Northstar i FlightCore." + "warning": "To okno zawiera różne funkcje do naprawy typowych problemów z Northstar i FlightCore.", + "disable_modsettings": "Wyłącz moda ModSettings", + "disable_modsettings_success": "Wyłączono moda ModSettings" } }, "nb_ts_mods_per_page_desc1": "Ma to wpływ na wydajność wyświetlania podczas przeglądania modów Thunderstore.", - "open_game_folder": "Otwórz folder" + "open_game_folder": "Otwórz folder", + "show_deprecated_mods_desc2": "Ostrożnie, mody są zazwyczaj oznaczone jako przestarzałe nie bez powodu.", + "show_deprecated_mods": "Pokaż przestarzałe mody Thunderstore", + "show_deprecated_mods_desc1": "Pozwala to zobaczyć przestarzałe mody w kolekcji modów online." }, "notification": { "game_folder": { |