From f137e13f23e48901d63a8695b6e16dab4c32d874 Mon Sep 17 00:00:00 2001 From: bitfriend Date: Tue, 22 Oct 2024 23:35:27 +0800 Subject: [PATCH 1/4] Append description for building on android emulator --- native/acter/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native/acter/build.rs b/native/acter/build.rs index 0981fe15831d..51a94eea1bda 100644 --- a/native/acter/build.rs +++ b/native/acter/build.rs @@ -92,7 +92,7 @@ fn setup_x86_64_android_workaround() { "Unsupported OS. You must use either Linux, MacOS or Windows to build the crate." ), }; - const DEFAULT_CLANG_VERSION: &str = "18"; + const DEFAULT_CLANG_VERSION: &str = "18"; // ndk v27.2.12479018 uses clang v18 let clang_version = std::env::var("NDK_CLANG_VERSION").unwrap_or_else(|_| DEFAULT_CLANG_VERSION.to_owned()); let linux_x86_64_lib_dir = format!( From 4722dad43bf5a85d8f65e083d61f7bd2198cd75a Mon Sep 17 00:00:00 2001 From: bitfriend Date: Tue, 22 Oct 2024 23:41:14 +0800 Subject: [PATCH 2/4] Replace quote with apostrophe in l10n --- app/lib/l10n/app_en.arb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/lib/l10n/app_en.arb b/app/lib/l10n/app_en.arb index c21079e6d37a..d90bc9ef8028 100644 --- a/app/lib/l10n/app_en.arb +++ b/app/lib/l10n/app_en.arb @@ -355,7 +355,7 @@ "@deleteTarget": {}, "deleteNewsDraftTitle": "Delete draft?", "@deleteNewsDraftTitle": {}, - "deleteNewsDraftText": "Are you sure you want to delete this draft? This can't be undone.", + "deleteNewsDraftText": "Are you sure you want to delete this draft? This can’t be undone.", "@deleteNewsDraftText": {}, "deleteDraftBtn" : "Delete draft", "@deleteDraftBtn" : {}, @@ -875,7 +875,7 @@ "@pleaseEnterEventName": {}, "pleaseFirstSelectASpace": "Please first select a space", "@pleaseFirstSelectASpace": {}, - "errorProcessingSlide": "We couldn't process slide {slideIdx}: {error}", + "errorProcessingSlide": "We couldn’t process slide {slideIdx}: {error}", "@errorProcessingSlide": {}, "pleaseProvideEmailAddressToAdd": "Please provide the email address you’d like to add", "@pleaseProvideEmailAddressToAdd": {}, From 8573435ec9c2c1e4560849090e2339a745aad8d0 Mon Sep 17 00:00:00 2001 From: bitfriend Date: Tue, 22 Oct 2024 23:52:49 +0800 Subject: [PATCH 3/4] Replace quote with apostrophe on flutter side --- app/lib/features/chat/pages/sub_chats_page.dart | 2 +- app/lib/features/spaces/pages/sub_spaces_page.dart | 2 +- app/lib/router/router.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/lib/features/chat/pages/sub_chats_page.dart b/app/lib/features/chat/pages/sub_chats_page.dart index 537074eeed56..8a243fdaf909 100644 --- a/app/lib/features/chat/pages/sub_chats_page.dart +++ b/app/lib/features/chat/pages/sub_chats_page.dart @@ -215,7 +215,7 @@ class SubChatsPage extends ConsumerWidget { final roomInfo = roomEntry.$1; final roomId = roomEntry.$2; if (roomInfo != null) { - // we don't have this room yet, need to show via room hierarchy + // we don’t have this room yet, need to show via room hierarchy final parentId = spaceId; return RoomHierarchyCard( key: Key('subchat-list-item-$roomId'), diff --git a/app/lib/features/spaces/pages/sub_spaces_page.dart b/app/lib/features/spaces/pages/sub_spaces_page.dart index f02d5137b03a..a58023e92903 100644 --- a/app/lib/features/spaces/pages/sub_spaces_page.dart +++ b/app/lib/features/spaces/pages/sub_spaces_page.dart @@ -233,7 +233,7 @@ class SubSpacesPage extends ConsumerWidget { final roomInfo = roomEntry.$1; final roomId = roomEntry.$2; if (roomInfo != null) { - // we don't have this room yet, need to show via room hierarchy + // we don’t have this room yet, need to show via room hierarchy final parentId = spaceId; return RoomHierarchyCard( key: Key('subspace-list-item-$roomId'), diff --git a/app/lib/router/router.dart b/app/lib/router/router.dart index d20215752a74..8d790874160d 100644 --- a/app/lib/router/router.dart +++ b/app/lib/router/router.dart @@ -86,7 +86,7 @@ Future forwardRedirect( final room = await client.room(roomId); if (!room.isJoined()) { - // we haven't joined yet or have been kicked + // we haven’t joined yet or have been kicked // either way, we are to be shown the thing on the activities page return state.namedLocation( Routes.activities.name, From 3851f47e6fbc2f35394c27d86e100b7012910362 Mon Sep 17 00:00:00 2001 From: bitfriend Date: Tue, 22 Oct 2024 23:53:06 +0800 Subject: [PATCH 4/4] Replace quote with apostrophe on rust side --- native/acter/build.rs | 2 +- native/core/src/events/settings/space.rs | 4 ++-- native/core/src/executor.rs | 2 +- native/file-event-cache/Readme.md | 2 +- native/media-cache-wrapper/Readme.md | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/native/acter/build.rs b/native/acter/build.rs index 51a94eea1bda..7d4f6b55c496 100644 --- a/native/acter/build.rs +++ b/native/acter/build.rs @@ -100,7 +100,7 @@ fn setup_x86_64_android_workaround() { ); let full_path = format!("{android_ndk_home}/{linux_x86_64_lib_dir}"); if !std::fs::exists(&full_path).unwrap() { - panic!("`clang_rt.builtins-x86_64-android` includes not found. `{full_path}` doesn't exist. Please adjust `$ANDROID_NDK_HOME` and/or `$NDK_CLANG_VERSION` to fix.") + panic!("`clang_rt.builtins-x86_64-android` includes not found. `{full_path}` doesn’t exist. Please adjust `$ANDROID_NDK_HOME` and/or `$NDK_CLANG_VERSION` to fix.") } println!("cargo:rustc-link-search={full_path}"); println!("cargo:rustc-link-lib=static=clang_rt.builtins-x86_64-android"); diff --git a/native/core/src/events/settings/space.rs b/native/core/src/events/settings/space.rs index 5c9cfef0e482..543be355413f 100644 --- a/native/core/src/events/settings/space.rs +++ b/native/core/src/events/settings/space.rs @@ -55,8 +55,8 @@ pub type EventsSettings = SimpleSettingWithTurnOff; /// Backwards compatibility note: /// -/// In an earlier version, we agreed that if pins, news and events hadn't changed, -/// we'd assume they are activated. Even switching the default today means, we'd +/// In an earlier version, we agreed that if pins, news and events hadn’t changed, +/// we’d assume they are activated. Even switching the default today means, we’d /// change that behavior for all where at least _some_ had been changed. Thus, we /// are keeping that behavior but _recommend_ using `off` to explicitly set /// the right behavior up for all future cases. diff --git a/native/core/src/executor.rs b/native/core/src/executor.rs index 8d8ec5c0541e..196b4a7159ec 100644 --- a/native/core/src/executor.rs +++ b/native/core/src/executor.rs @@ -379,7 +379,7 @@ mod tests { assert_eq!(inner_model, model); - // now let's redact this model; + // now let’s redact this model; let redaction: UnsignedRoomRedactionEvent = from_value(json!({ "event_id" : format!("{model_id}:redacted"), diff --git a/native/file-event-cache/Readme.md b/native/file-event-cache/Readme.md index 6c961f8ca404..9179c01d7c2f 100644 --- a/native/file-event-cache/Readme.md +++ b/native/file-event-cache/Readme.md @@ -44,7 +44,7 @@ Because the data is store specific, the files stored will also be specific to th This is 100% backwards compatible with the `matrix-sdk-store-media-cache-wrapper` file implementation. Passing the proper state store -The test suite is run against using `matrix-sdk-sqlite` `SqliteStore`. Though there is no reason to believe it shouldn't work with any store implementing the `StateStore`-interface, this is the only one it has been tested with successfully. +The test suite is run against using `matrix-sdk-sqlite` `SqliteStore`. Though there is no reason to believe it shouldn’t work with any store implementing the `StateStore`-interface, this is the only one it has been tested with successfully. This is part of [Acter](https://acter.global), which we are providing regular releases of for iOS, Android and Linux, MacOS & Windows, supporting at least the latest stable release. This crate is included in that and thus constantly tested for these environments. diff --git a/native/media-cache-wrapper/Readme.md b/native/media-cache-wrapper/Readme.md index 676b48351948..5b097282ecc7 100644 --- a/native/media-cache-wrapper/Readme.md +++ b/native/media-cache-wrapper/Readme.md @@ -2,4 +2,4 @@ ## Deprecated -Since [the merge #3858 of into `main`](https://github.com/matrix-org/matrix-rust-sdk/pull/3858) splitting the media cache features off into its own trait, there is no need to wrap the matrix-sdk store anymore to do so. Thus this crate is no longer needed and won't be maintained. +Since [the merge #3858 of into `main`](https://github.com/matrix-org/matrix-rust-sdk/pull/3858) splitting the media cache features off into its own trait, there is no need to wrap the matrix-sdk store anymore to do so. Thus this crate is no longer needed and won’t be maintained.