From f492033cbfe972ba42b4336f4e4afd0379f9835d Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 9 Dec 2019 00:24:53 -0800 Subject: [PATCH] Adding custom language setting. - Fixes #319 --- README.md | 18 ++++----- install.sh | 2 +- .../2019-12-09-060754_add_lang/down.sql | 1 + .../2019-12-09-060754_add_lang/up.sql | 1 + server/src/api/user.rs | 6 +++ server/src/apub.rs | 1 + server/src/db/comment.rs | 1 + server/src/db/comment_view.rs | 1 + server/src/db/community.rs | 1 + server/src/db/moderator.rs | 2 + server/src/db/password_reset_request.rs | 1 + server/src/db/post.rs | 1 + server/src/db/post_view.rs | 1 + server/src/db/user.rs | 6 +++ server/src/db/user_mention.rs | 2 + server/src/schema.rs | 1 + ui/src/components/user.tsx | 35 +++++++++++++++++ ui/src/interfaces.ts | 2 + ui/src/translations/en.ts | 2 + ui/src/utils.ts | 39 +++++++++++++++---- 20 files changed, 107 insertions(+), 17 deletions(-) create mode 100644 server/migrations/2019-12-09-060754_add_lang/down.sql create mode 100644 server/migrations/2019-12-09-060754_add_lang/up.sql diff --git a/README.md b/README.md index 1f06b08..273a1b9 100644 --- a/README.md +++ b/README.md @@ -247,15 +247,15 @@ If you'd like to add translations, take a look a look at the [English translatio lang | done | missing --- | --- | --- -de | 79% | cross_posts,cross_post,users,number_of_communities,preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,settings,stickied,delete_account,delete_account_confirm,banned,creator,number_online,subscribed,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,expires,recent_comments,nsfw,show_nsfw,theme,crypto,monero,joined,by,to,transfer_community,transfer_site,are_you_sure,yes,no -eo | 87% | number_of_communities,preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,theme,are_you_sure,yes,no -es | 96% | archive_link,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup -fr | 96% | archive_link,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup -it | 97% | archive_link,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup -nl | 89% | preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,theme -ru | 83% | cross_posts,cross_post,number_of_communities,preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,recent_comments,theme,monero,by,to,transfer_community,transfer_site,are_you_sure,yes,no -sv | 96% | archive_link,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup -zh | 81% | cross_posts,cross_post,users,number_of_communities,preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,settings,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,recent_comments,nsfw,show_nsfw,theme,monero,by,to,transfer_community,transfer_site,are_you_sure,yes,no +de | 78% | cross_posts,cross_post,users,number_of_communities,preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,settings,stickied,delete_account,delete_account_confirm,banned,creator,number_online,subscribed,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,expires,language,browser_default,recent_comments,nsfw,show_nsfw,theme,crypto,monero,joined,by,to,transfer_community,transfer_site,are_you_sure,yes,no +eo | 86% | number_of_communities,preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default,theme,are_you_sure,yes,no +es | 95% | archive_link,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default +fr | 95% | archive_link,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default +it | 96% | archive_link,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default +nl | 88% | preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default,theme +ru | 82% | cross_posts,cross_post,number_of_communities,preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default,recent_comments,theme,monero,by,to,transfer_community,transfer_site,are_you_sure,yes,no +sv | 95% | archive_link,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default +zh | 80% | cross_posts,cross_post,users,number_of_communities,preview,upload_image,formatting_help,view_source,sticky,unsticky,archive_link,settings,stickied,delete_account,delete_account_confirm,banned,creator,number_online,replies,mentions,forgot_password,reset_password_mail_sent,password_change,new_password,no_email_setup,language,browser_default,recent_comments,nsfw,show_nsfw,theme,monero,by,to,transfer_community,transfer_site,are_you_sure,yes,no If you'd like to update this report, run: diff --git a/install.sh b/install.sh index 80d3277..bbed1c9 100755 --- a/install.sh +++ b/install.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -export DATABASE_URL=postgres://rrr:rrr@localhost/rrr +export DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy export JWT_SECRET=changeme export HOSTNAME=rrr diff --git a/server/migrations/2019-12-09-060754_add_lang/down.sql b/server/migrations/2019-12-09-060754_add_lang/down.sql new file mode 100644 index 0000000..c133559 --- /dev/null +++ b/server/migrations/2019-12-09-060754_add_lang/down.sql @@ -0,0 +1 @@ +alter table user_ drop column lang; diff --git a/server/migrations/2019-12-09-060754_add_lang/up.sql b/server/migrations/2019-12-09-060754_add_lang/up.sql new file mode 100644 index 0000000..98a72ad --- /dev/null +++ b/server/migrations/2019-12-09-060754_add_lang/up.sql @@ -0,0 +1 @@ +alter table user_ add column lang varchar(20) default 'browser' not null; diff --git a/server/src/api/user.rs b/server/src/api/user.rs index 7f7af81..bc51c8e 100644 --- a/server/src/api/user.rs +++ b/server/src/api/user.rs @@ -25,6 +25,7 @@ pub struct SaveUserSettings { theme: String, default_sort_type: i16, default_listing_type: i16, + lang: String, auth: String, } @@ -220,6 +221,7 @@ impl Perform for Oper { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; // Create the user @@ -313,6 +315,7 @@ impl Perform for Oper { theme: data.theme.to_owned(), default_sort_type: data.default_sort_type, default_listing_type: data.default_listing_type, + lang: data.lang.to_owned(), }; let updated_user = match User_::update(&conn, user_id, &user_form) { @@ -445,6 +448,7 @@ impl Perform for Oper { theme: read_user.theme, default_sort_type: read_user.default_sort_type, default_listing_type: read_user.default_listing_type, + lang: read_user.lang, }; match User_::update(&conn, data.user_id, &user_form) { @@ -506,6 +510,7 @@ impl Perform for Oper { theme: read_user.theme, default_sort_type: read_user.default_sort_type, default_listing_type: read_user.default_listing_type, + lang: read_user.lang, }; match User_::update(&conn, data.user_id, &user_form) { @@ -842,6 +847,7 @@ impl Perform for Oper { theme: read_user.theme, default_sort_type: read_user.default_sort_type, default_listing_type: read_user.default_listing_type, + lang: read_user.lang, }; let updated_user = match User_::update_password(&conn, user_id, &user_form) { diff --git a/server/src/apub.rs b/server/src/apub.rs index 3c7202b..66878d3 100644 --- a/server/src/apub.rs +++ b/server/src/apub.rs @@ -76,6 +76,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let person = expected_user.person(); diff --git a/server/src/db/comment.rs b/server/src/db/comment.rs index 64532b8..b7bd562 100644 --- a/server/src/db/comment.rs +++ b/server/src/db/comment.rs @@ -181,6 +181,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let inserted_user = User_::create(&conn, &new_user).unwrap(); diff --git a/server/src/db/comment_view.rs b/server/src/db/comment_view.rs index dd53ddc..54c43b9 100644 --- a/server/src/db/comment_view.rs +++ b/server/src/db/comment_view.rs @@ -415,6 +415,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let inserted_user = User_::create(&conn, &new_user).unwrap(); diff --git a/server/src/db/community.rs b/server/src/db/community.rs index bfc6089..9546907 100644 --- a/server/src/db/community.rs +++ b/server/src/db/community.rs @@ -267,6 +267,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let inserted_user = User_::create(&conn, &new_user).unwrap(); diff --git a/server/src/db/moderator.rs b/server/src/db/moderator.rs index b04c6c6..22547ca 100644 --- a/server/src/db/moderator.rs +++ b/server/src/db/moderator.rs @@ -449,6 +449,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let inserted_mod = User_::create(&conn, &new_mod).unwrap(); @@ -466,6 +467,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let inserted_user = User_::create(&conn, &new_user).unwrap(); diff --git a/server/src/db/password_reset_request.rs b/server/src/db/password_reset_request.rs index 265945d..8c65b4c 100644 --- a/server/src/db/password_reset_request.rs +++ b/server/src/db/password_reset_request.rs @@ -92,6 +92,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let inserted_user = User_::create(&conn, &new_user).unwrap(); diff --git a/server/src/db/post.rs b/server/src/db/post.rs index f185bd7..96ae31d 100644 --- a/server/src/db/post.rs +++ b/server/src/db/post.rs @@ -194,6 +194,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let inserted_user = User_::create(&conn, &new_user).unwrap(); diff --git a/server/src/db/post_view.rs b/server/src/db/post_view.rs index 7a58973..4fcd8e4 100644 --- a/server/src/db/post_view.rs +++ b/server/src/db/post_view.rs @@ -345,6 +345,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let inserted_user = User_::create(&conn, &new_user).unwrap(); diff --git a/server/src/db/user.rs b/server/src/db/user.rs index 064bff3..3d3865e 100644 --- a/server/src/db/user.rs +++ b/server/src/db/user.rs @@ -23,6 +23,7 @@ pub struct User_ { pub theme: String, pub default_sort_type: i16, pub default_listing_type: i16, + pub lang: String, } #[derive(Insertable, AsChangeset, Clone)] @@ -40,6 +41,7 @@ pub struct UserForm { pub theme: String, pub default_sort_type: i16, pub default_listing_type: i16, + pub lang: String, } impl Crud for User_ { @@ -96,6 +98,7 @@ pub struct Claims { pub theme: String, pub default_sort_type: i16, pub default_listing_type: i16, + pub lang: String, } impl Claims { @@ -119,6 +122,7 @@ impl User_ { theme: self.theme.to_owned(), default_sort_type: self.default_sort_type, default_listing_type: self.default_listing_type, + lang: self.lang.to_owned(), }; encode( &Header::default(), @@ -175,6 +179,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let inserted_user = User_::create(&conn, &new_user).unwrap(); @@ -195,6 +200,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let read_user = User_::read(&conn, inserted_user.id).unwrap(); diff --git a/server/src/db/user_mention.rs b/server/src/db/user_mention.rs index 668d28f..7eb4d48 100644 --- a/server/src/db/user_mention.rs +++ b/server/src/db/user_mention.rs @@ -75,6 +75,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let inserted_user = User_::create(&conn, &new_user).unwrap(); @@ -92,6 +93,7 @@ mod tests { theme: "darkly".into(), default_sort_type: SortType::Hot as i16, default_listing_type: ListingType::Subscribed as i16, + lang: "browser".into(), }; let inserted_recipient = User_::create(&conn, &recipient_form).unwrap(); diff --git a/server/src/schema.rs b/server/src/schema.rs index 5fc7095..bd73aab 100644 --- a/server/src/schema.rs +++ b/server/src/schema.rs @@ -266,6 +266,7 @@ table! { theme -> Varchar, default_sort_type -> Int2, default_listing_type -> Int2, + lang -> Varchar, } } diff --git a/ui/src/components/user.tsx b/ui/src/components/user.tsx index 0aba995..bf77d4b 100644 --- a/ui/src/components/user.tsx +++ b/ui/src/components/user.tsx @@ -27,6 +27,7 @@ import { capitalizeFirstLetter, themes, setTheme, + languages, } from '../utils'; import { PostListing } from './post-listing'; import { SortSelect } from './sort-select'; @@ -94,6 +95,7 @@ export class User extends Component { theme: null, default_sort_type: null, default_listing_type: null, + lang: null, auth: null, }, userSettingsLoading: null, @@ -420,6 +422,32 @@ export class User extends Component { #
+
+
+ + +
+