mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2025-09-02 19:23:49 +00:00
Code Issues Projects Releases Wiki Activity

Dont force enable undetermined language anymore (fixes #5487) (#5491)

Browse source 
* Dont force enable undetermined language anymore (fixes #5487)

* fix test
This commit is contained in:
Nutomic 2025-03-10 15:52:35 +00:00 committed by GitHub
parent 3dfb0cab36
commit 96e4621cb8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api_tests/src/user.spec.ts
View file

@ -181,7 +181,7 @@ test("Create user with accept-language", async () => {
.map(l => l.code); .map(l => l.code);
// should have languages from accept header, as well as "undetermined" // should have languages from accept header, as well as "undetermined"
// which is automatically enabled by backend // which is automatically enabled by backend
expect(langs).toStrictEqual(["und", "de", "en", "fr"]); expect(langs).toStrictEqual(["de", "en", "fr"]);
}); });
test("Set a new avatar, old avatar is deleted", async () => { test("Set a new avatar, old avatar is deleted", async () => {

14
crates/db_schema/src/impls/actor_language.rs
View file

@ -61,7 +61,7 @@ impl LocalUserLanguage {
for_local_user_id: LocalUserId, for_local_user_id: LocalUserId,
) -> Result<(), Error> { ) -> Result<(), Error> {
let conn = &mut get_conn(pool).await?; let conn = &mut get_conn(pool).await?;
let mut lang_ids = convert_update_languages(conn, language_ids).await?; let lang_ids = convert_update_languages(conn, language_ids).await?;
// No need to update if languages are unchanged // No need to update if languages are unchanged
let current = LocalUserLanguage::read(&mut conn.into(), for_local_user_id).await?; let current = LocalUserLanguage::read(&mut conn.into(), for_local_user_id).await?;
@ -69,16 +69,6 @@ impl LocalUserLanguage {
return Ok(()); return Ok(());
} }
// TODO: Force enable undetermined language for all users. This is necessary because many posts
// don't have a language tag (e.g. those from other federated platforms), so Lemmy users
// won't see them if undetermined language is disabled.
// This hack can be removed once a majority of posts have language tags, or when it is
// clearer for new users that they need to enable undetermined language.
// See https://github.com/LemmyNet/lemmy-ui/issues/999
if !lang_ids.contains(&UNDETERMINED_ID) {
lang_ids.push(UNDETERMINED_ID);
}
conn conn
.build_transaction() .build_transaction()
.run(|conn| { .run(|conn| {
@ -531,7 +521,7 @@ mod tests {
let test_langs2 = test_langs2(pool).await?; let test_langs2 = test_langs2(pool).await?;
LocalUserLanguage::update(pool, test_langs2, local_user.id).await?; LocalUserLanguage::update(pool, test_langs2, local_user.id).await?;
let local_user_langs2 = LocalUserLanguage::read(pool, local_user.id).await?; let local_user_langs2 = LocalUserLanguage::read(pool, local_user.id).await?;
assert_eq!(3, local_user_langs2.len()); assert_eq!(2, local_user_langs2.len());
Person::delete(pool, person.id).await?; Person::delete(pool, person.id).await?;
LocalUser::delete(pool, local_user.id).await?; LocalUser::delete(pool, local_user.id).await?;

2
crates/db_views/src/comment/comment_view.rs
View file

@ -730,7 +730,7 @@ mod tests {
} }
.list(&data.site, pool) .list(&data.site, pool)
.await?; .await?;
assert_length!(2, finnish_comments); assert_length!(1, finnish_comments);
let finnish_comment = finnish_comments let finnish_comment = finnish_comments
.iter() .iter()
.find(|c| c.comment.language_id == finnish_id); .find(|c| c.comment.language_id == finnish_id);

7
crates/db_views/src/post/post_view.rs
View file

@ -1448,13 +1448,10 @@ mod tests {
let post_listing_french = data.default_post_query().list(&data.site, pool).await?; let post_listing_french = data.default_post_query().list(&data.site, pool).await?;
// only one post in french and one undetermined should be returned // only one post in french and one undetermined should be returned
assert_eq!( assert_eq!(vec![POST_WITH_TAGS, POST], names(&post_listing_french));
vec![POST_WITH_TAGS, POST_BY_BOT, POST],
names(&post_listing_french)
);
assert_eq!( assert_eq!(
Some(french_id), Some(french_id),
post_listing_french.get(2).map(|p| p.post.language_id) post_listing_french.get(1).map(|p| p.post.language_id)
); );
LocalUserLanguage::update( LocalUserLanguage::update(