From cd1a6830334d6930a50d16258ea98251b2ad20e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Dec 2020 19:56:01 +0000 Subject: [PATCH 001/505] Bump ini from 1.3.5 to 1.3.7 Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7. - [Release notes](https://github.com/isaacs/ini/releases) - [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index ce659fbed9..8004bf2aab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4613,9 +4613,9 @@ inherits@2.0.3: integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= ini@^1.3.4, ini@~1.3.0: - version "1.3.5" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" - integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== + version "1.3.7" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.7.tgz#a09363e1911972ea16d7a8851005d84cf09a9a84" + integrity sha512-iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ== inquirer@^3.0.6: version "3.3.0" From c0296ca6f18c28a15f9bfc66075d366e020e0776 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 07:05:01 +0200 Subject: [PATCH 002/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 4ada16d68a..71668c841e 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -15,19 +15,19 @@ "vote": "Vote", "reblog": "Reblog am", "login": "Login", - "incoming_transfer_title": "Incoming transfer", - "outgoing_transfer_title": "Outgoing transfer", + "incoming_transfer_title": "Something wey dey enter", + "outgoing_transfer_title": "Something wey dey comot", "checkin_extra": "Awoof", - "delegation": "Delegation", + "delegation": "Wetin dem dash you", "delegations": "Wetin dem dash you", - "delegation_title": "Delegation reward", + "delegation_title": "Things wey dem dash you", "delegation_desc": "Collect some things ontop wetin you dash everyday", "post_title": "Point for post", "comment_title": "Point for comment", "vote_title": "Point for vote", "reblog_title": "Point for reblog", "login_title": "Point for login", - "checkin_title": "Points for heartbeat", + "checkin_title": "Things for dem heartbeat", "referral": "Send person come", "referral_title": "Money for person wey you send come", "referral_desc": "Send your padi come make you collect some things", @@ -42,15 +42,15 @@ "reblog_desc": "You fit tell ur padi d tori wey you enjoy make you collect some things too.", "login_desc": "You go collect 100 somethings when you enta the application as jjc.", "checkin_extra_desc": "You go get chance collect beta some things if you dey use the application wella, and say you dey sha prapra.", - "dropdown_transfer": "Gift", - "dropdown_promote": "Promote", - "dropdown_boost": "Boost", + "dropdown_transfer": "Dash", + "dropdown_promote": "Loud am", + "dropdown_boost": "Give am push", "from": "From", "to": "To", "estimated_value_desc": "Based on the money wey u take buy am", "estimated_value": "The value wey we use eye gauge", "estimated_amount": "Wetin your vote dey give", - "amount_information": "Drag the slider to adjust the amount", + "amount_information": "Move d slider so you go fit change d amount as u like", "amount": "Amount", "memo": "Memo", "information": "Are you sure to transfer funds?", From 2637f8445786ccf9ce704f23ce8f9115dc8fc39f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 07:14:39 +0200 Subject: [PATCH 003/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 58 +++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 71668c841e..628c91820d 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -53,7 +53,7 @@ "amount_information": "Move d slider so you go fit change d amount as u like", "amount": "Amount", "memo": "Memo", - "information": "Are you sure to transfer funds?", + "information": "You sure say u wan send d money?", "amount_desc": "Balance", "memo_desc": "Na everybody go see this memo", "to_placeholder": "Guy-name", @@ -66,7 +66,7 @@ "withdraw_to_saving": "Comot for wia you keep am", "steemconnect_title": "Carry am go Hivesigner", "next": "NEXT", - "delegate": "Delegate", + "delegate": "Wetin dem dash you", "power_down": "Power Down", "withdraw_steem": "Comot HIVE", "withdraw_sbd": "Comot HBD", @@ -77,7 +77,7 @@ "escrow_release": "Escrow don comot hand", "escrow_approve": "Escrow don say na Ogbonge", "cancel_transfer_from_savings": "No do am again for Savings", - "delegate_vesting_shares": "Delegation", + "delegate_vesting_shares": "Wetin dem dash you", "fill_convert_request": "Turn am don dey kampe", "fill_transfer_from_savings": "We don keep am kampe", "fill_vesting_withdraw": "To comot money don start", @@ -124,7 +124,7 @@ "notification": "Alerts", "leaderboard": "Leaderboard", "epoint": "Points", - "leaderboard_title": "Top Users", + "leaderboard_title": "Dem people wey dey lead", "recent": "Latest", "yesterday": "Yesterday", "this_week": "This Week", @@ -192,7 +192,7 @@ "transfers": "Transfer" }, "pincode": "PIN code", - "reset_pin": "Reset Pin Code", + "reset_pin": "Format your pin code", "reset": "Reset", "nsfw_content": "E no good to dey watch am outside", "send_feedback": "Send as you see am", @@ -205,44 +205,44 @@ }, "feedback_success": "Email don open successfully", "feedback_fail": "Email no gree open", - "server_fail": "Server not available" + "server_fail": "Server no dey" }, "voters": { "voters_info": "People Wey Vote informate", - "no_user": "User is not found." + "no_user": "We no fit see d person." }, "login": { "signin": "Login for here", "signup": "ENTER NOW", - "signin_title": "To get all the benefits of using Ecency", + "signin_title": "To enjoy all the yanfu-yanfu wey dey Ecency", "username": "Guy-name", "password": "Password or WIF", - "description": "By signing in, you agree to our Terms of Services and Privacy Policies.", + "description": "As you enter so, you don gree for how we dey run tinz for here.", "cancel": "cancel", "login": "LOGIN", - "steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Hivesigner.", - "steemconnect_fee_description": "info" + "steemconnect_description": "If you no wan make ur key dey safe and make we put am for ur fone, you fit use HiveSigner.", + "steemconnect_fee_description": "informate" }, "register": { - "button": "Sign Up", + "button": "Register for here", "title": "Register", - "username": "Pick a username", - "mail": "Enter your email address", - "ref_user": "Referred user (Optional)", - "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", - "title_description": "One account to manage everything", - "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." + "username": "Select wetin dem go dey call you", + "mail": "Put your email for here", + "ref_user": "Person wey send you come (No be by force)", + "500_error": "We no fit do wetin u ask now, people plenty wey wan register! Try for some time...", + "title_description": "Run everything for one account", + "form_description": "As you enter so, you don gree for how we dey run tinz for here." }, "home": { "feed": "Tori", "popular": "Popular", - "top": "Top", - "hot": "Hot", - "new": "New", + "top": "Upper", + "hot": "Wey dey hot", + "new": "Wey new", "blog": "Blog", "posts": "Post", - "friends": "Friends", - "communities": "Communities" + "friends": "Ur padis", + "communities": "Una areas" }, "side_menu": { "profile": "Your informate", @@ -269,16 +269,16 @@ }, "editor": { "title": "Title", - "tags": "Tags (separate with space)", - "default_placeholder": "Tell us something...", - "reply_placeholder": "Add your reply...", + "tags": "Wetin dem use sabi something (put space for dia middle)", + "default_placeholder": "Yarn us tori...", + "reply_placeholder": "Chook ur mouth for the matter...", "publish": "Post am", "reply": "Reply", "open_gallery": "Open Picture", "capture_photo": "Take new picture", - "limited_tags": "Only 10 tags allowed, remove some", - "limited_length": "Maximum length of each tag should be 24", - "limited_dash": "Use one dash in each tag", + "limited_tags": "Na only ten tags we fit accept, comot d extra wey dey", + "limited_length": "The tag no gaz pass 24", + "limited_dash": "Na only one dash u fit use for one tag", "limited_space": "Use space to separate tags", "limited_lowercase": "Only use lower letters in tag", "limited_characters": "Use only lowercase letters, digits and one dash", From 78d20cdb55b1935b2434d111b3431cd8669b5d03 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 12:58:58 +0200 Subject: [PATCH 004/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 084506aa21..19c9d559c0 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -83,7 +83,7 @@ "fill_vesting_withdraw": "PowerDown executed", "estm": { "title": "Pontok", - "buy": "GET POINTS" + "buy": "SZEREZZ PONTOKAT" }, "savingsteem": { "title": "HIVE Savings" From 90b698ea7fa228aa39d992cfe85d8199351bc6f9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 13:11:38 +0200 Subject: [PATCH 005/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 19c9d559c0..25e0411ccc 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -30,7 +30,7 @@ "checkin_title": "Életjel pontok", "referral": "Ajánló", "referral_title": "Ajánlói jutalom", - "referral_desc": "Invite friends and earn Points", + "referral_desc": "Hívd meg a barátaid és nyerj Pontokat", "checkin_extra_title": "Használati bónusz", "no_activity": "Nincs friss tevékenység", "outgoing_transfer_description": "", @@ -60,36 +60,36 @@ "memo_placeholder": "Megjegyzés ide", "transfer_token": "Átutalás", "purchase_estm": "SZEREZZ PONTOKAT", - "points": "Gift Points to someone", + "points": "Ajándékozz Pontokat valakinek", "transfer_to_saving": "A megtakarításokhoz", "powerUp": "Power Up", - "withdraw_to_saving": "Withdraw Saving", + "withdraw_to_saving": "Átutalás a Megtakarításokhoz", "steemconnect_title": "Hivesigner Transfer", "next": "KÖVETKEZŐ", "delegate": "Delegálás", "power_down": "Power Down", - "withdraw_steem": "Withdraw HIVE", - "withdraw_sbd": "Withdraw HBD", + "withdraw_steem": "Hive Visszavonás", + "withdraw_sbd": "HBD Visszavonás", "transfer_to_savings": "A megtakarításokhoz", "convert": "Konvertálás", "escrow_transfer": "Letéti átutalás", "escrow_dispute": "Letéti vita", "escrow_release": "Letéti engedély", "escrow_approve": "Letéti jóváhagyás", - "cancel_transfer_from_savings": "Cancel From Savings", + "cancel_transfer_from_savings": "A megtakarításoktól való átutalás törlése", "delegate_vesting_shares": "Delegálás", "fill_convert_request": "Átváltás végrehajtva", "fill_transfer_from_savings": "Savings Executed", - "fill_vesting_withdraw": "PowerDown executed", + "fill_vesting_withdraw": "PowerDown végrehajtva", "estm": { "title": "Pontok", "buy": "SZEREZZ PONTOKAT" }, "savingsteem": { - "title": "HIVE Savings" + "title": "HIVE Megtakarítások" }, "savingsbd": { - "title": "HBD Savings" + "title": "HBD Megtakarítások" }, "steem": { "title": "HIVE", From 444204326af3b3cbdef42c5cd05e0040154a9516 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 13:17:11 +0200 Subject: [PATCH 006/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 25e0411ccc..2ab9adadd9 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -118,8 +118,8 @@ "ignore": "mellőzött téged", "reblog": "megosztotta", "transfer": "átutalva", - "spin": "Time to earn more Points", - "inactive": "Be active! Write a post, continue earning", + "spin": "Pontszerzés ideje", + "inactive": "Légy aktív! Írj egy bejegyzést és folytasd a cryptoszerzést", "referral": "joined with your referral, welcome them", "notification": "Értesítések", "leaderboard": "Ranglista", From c5774392944760acf064a76c01132710634e7a43 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 13:38:32 +0200 Subject: [PATCH 007/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 2ab9adadd9..ff7864f913 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -120,7 +120,7 @@ "transfer": "átutalva", "spin": "Pontszerzés ideje", "inactive": "Légy aktív! Írj egy bejegyzést és folytasd a cryptoszerzést", - "referral": "joined with your referral, welcome them", + "referral": "regisztrált a te ajánlásoddal, üdvözöld őt", "notification": "Értesítések", "leaderboard": "Ranglista", "epoint": "Pontok", @@ -159,7 +159,7 @@ "voting_power": "Szavazóerő", "login_to_see": "A megtekintéshez jelentkezz be", "follow_people": "Kövess néhány felhasználót, hogy töltsd meg a hírcsatornád", - "follow_communities": "Join some communities to fill your feed", + "follow_communities": "Csatalkozz néhány közösséghez, hogy betöltsd a hírcsatornádat", "havent_commented": "még nem szólt hozzá semmihez", "havent_posted": "még nem tett közzé semmit", "steem_power": "Hive Power", @@ -214,10 +214,10 @@ "login": { "signin": "Bejelentkezés", "signup": "CSATLAKOZZ MOST", - "signin_title": "To get all the benefits of using Ecency", + "signin_title": "Jelentkezz be ahhoz, hogy minden előnyben részesülj", "username": "Felhasználónév", "password": "Jelszó vagy a WIF", - "description": "By signing in, you agree to our Terms of Services and Privacy Policies.", + "description": "Regisztrálással elfogadod a Felhasználói feltételeket és az Adatvédelmi szabályzatot.", "cancel": "visszavonom", "login": "BEJELENTKEZÉS", "steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Hivesigner.", From 00b60c45dbcc1dff53d4706153694ffae8afda46 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 13:51:04 +0200 Subject: [PATCH 008/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index ff7864f913..4e294ecf42 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -220,15 +220,15 @@ "description": "Regisztrálással elfogadod a Felhasználói feltételeket és az Adatvédelmi szabályzatot.", "cancel": "visszavonom", "login": "BEJELENTKEZÉS", - "steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Hivesigner.", + "steemconnect_description": "Ha nem szeretnéd a jelszavad a készülékeden elmentve tárolni, használhatod a Hivesigner-t.", "steemconnect_fee_description": "infó" }, "register": { - "button": "Sign Up", + "button": "Regisztráció", "title": "Regisztráció", - "username": "Pick a username", - "mail": "Enter your email address", - "ref_user": "Referred user (Optional)", + "username": "Válassz felhasználónevet", + "mail": "Add meg az e-mail címed", + "ref_user": "Ajánló felhasználó (opcionális)", "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", "title_description": "One account to manage everything", "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." From 80e18ee586d85056c3642251837b52e5da6cd5f0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 13:58:26 +0200 Subject: [PATCH 009/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 4e294ecf42..0cedfa4dd9 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -229,7 +229,7 @@ "username": "Válassz felhasználónevet", "mail": "Add meg az e-mail címed", "ref_user": "Ajánló felhasználó (opcionális)", - "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", + "500_error": "Kérésedet nem sikerült feldolgozni, a regisztrációs sor valószínűleg megtelt! Próbálkozzon újra néhány perc múlva...", "title_description": "One account to manage everything", "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." }, @@ -241,8 +241,8 @@ "new": "Új", "blog": "Blog", "posts": "Bejegyzések", - "friends": "Friends", - "communities": "Communities" + "friends": "Barátok", + "communities": "Közösségek" }, "side_menu": { "profile": "Profil", @@ -269,7 +269,7 @@ }, "editor": { "title": "Cím", - "tags": "Tags (separate with space)", + "tags": "Címkék (szóközzel elválasztva)", "default_placeholder": "Mondj valamit...", "reply_placeholder": "A válaszod...", "publish": "Közzétesz", @@ -277,8 +277,8 @@ "open_gallery": "Galéria Megnyitása", "capture_photo": "Készíts egy fotót", "limited_tags": "Csak 10 címke engedélyezett, törölj néhányat", - "limited_length": "Maximum length of each tag should be 24", - "limited_dash": "Use one dash in each tag", + "limited_length": "Címkék maximális hossza 24 lehet", + "limited_dash": "Használj egy kötőjelet minden címkében", "limited_space": "Use space to separate tags", "limited_lowercase": "Csak kisbetüt használj a címkékhez", "limited_characters": "Use only lowercase letters, digits and one dash", From 4cc4e8dda0c38608fc60c339718c3c232020e335 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 14:08:36 +0200 Subject: [PATCH 010/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 0cedfa4dd9..db9bdc24dd 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -279,11 +279,11 @@ "limited_tags": "Csak 10 címke engedélyezett, törölj néhányat", "limited_length": "Címkék maximális hossza 24 lehet", "limited_dash": "Használj egy kötőjelet minden címkében", - "limited_space": "Use space to separate tags", + "limited_space": "A címkék elválasztásához használj szóközt", "limited_lowercase": "Csak kisbetüt használj a címkékhez", - "limited_characters": "Use only lowercase letters, digits and one dash", + "limited_characters": "Csak kisbetűt, számjegyeket és egy kötőjelet használj", "limited_firstchar": "A címkének betűvel kell kezdődnie", - "limited_lastchar": "Tag must end with letter or number", + "limited_lastchar": "A címkéknek betűvel vagy számmal kell végződnie", "setting_schedule": "Scheduling Time", "setting_reward": "Reward", "setting_beneficiary": "Beneficiary", From 89223672bd75de4f8d1027237b42ef380672caf9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 14:19:20 +0200 Subject: [PATCH 011/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index db9bdc24dd..7b108017a6 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -284,11 +284,11 @@ "limited_characters": "Csak kisbetűt, számjegyeket és egy kötőjelet használj", "limited_firstchar": "A címkének betűvel kell kezdődnie", "limited_lastchar": "A címkéknek betűvel vagy számmal kell végződnie", - "setting_schedule": "Scheduling Time", - "setting_reward": "Reward", - "setting_beneficiary": "Beneficiary", - "reward_default": "Default 50% / 50%", - "reward_power_up": "Power Up 100%", + "setting_schedule": "Beütemezési időpont", + "setting_reward": "Jutalom", + "setting_beneficiary": "Kedvezményezett", + "reward_default": "Alapértelmezett 50% / 50%", + "reward_power_up": "100%-os Power Up", "reward_decline": "Decline Payout", "beneficiaries": "Beneficiaries", "options": "Options", @@ -488,7 +488,7 @@ } }, "free_estm": { - "title": "Free Points", + "title": "Ingyenes pontok", "button": "PÖRGESS ÉS NYERJ", "get_spin": "5 PÖRGETÉS", "spin_right": "Pörgesd balra", @@ -499,7 +499,7 @@ "days": "nap", "user": "Felhasználó", "permlink": "Bejegyzés", - "permlinkPlaceholder": "username/permlink", + "permlinkPlaceholder": "felhasználónév/permlink", "information": "Bistos hirdeted?" }, "boostPost": { @@ -523,16 +523,16 @@ "comments": { "title": "Hozzászólások", "reveal_comment": "Hozzászólás megjelenítése", - "read_more": "Read more comments", + "read_more": "Még több hozzáaszólás", "more_replies": "további hozzászólások betöltése" }, "search_result": { - "others": "Others", + "others": "Egyéb", "communities": { - "title": "Communities", - "subscribe": "Join", - "unsubscribe": "Leave", - "subscribers": "Members", + "title": "Közösségek", + "subscribe": "Csatlakozz", + "unsubscribe": "Kilépés", + "subscribers": "Tagok", "posters": "Posters", "posts": "Bejegyzések" }, From 687c7ae76b1f89b107239a4aec888b4a0f869d99 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 14:28:23 +0200 Subject: [PATCH 012/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 7b108017a6..25b5027410 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -64,7 +64,7 @@ "transfer_to_saving": "A megtakarításokhoz", "powerUp": "Power Up", "withdraw_to_saving": "Átutalás a Megtakarításokhoz", - "steemconnect_title": "Hivesigner Transfer", + "steemconnect_title": "Hivesigner átutalás", "next": "KÖVETKEZŐ", "delegate": "Delegálás", "power_down": "Power Down", @@ -79,7 +79,7 @@ "cancel_transfer_from_savings": "A megtakarításoktól való átutalás törlése", "delegate_vesting_shares": "Delegálás", "fill_convert_request": "Átváltás végrehajtva", - "fill_transfer_from_savings": "Savings Executed", + "fill_transfer_from_savings": "A megtakarításoktól végrehajtva", "fill_vesting_withdraw": "PowerDown végrehajtva", "estm": { "title": "Pontok", @@ -533,28 +533,28 @@ "subscribe": "Csatlakozz", "unsubscribe": "Kilépés", "subscribers": "Tagok", - "posters": "Posters", + "posters": "Bejegyzés írók", "posts": "Bejegyzések" }, "communities_filter": { - "my": "My Communities", - "rank": "Rank", - "subs": "Members", - "new": "New" + "my": "Közösségeim", + "rank": "Rang", + "subs": "Tagok", + "new": "Új" }, "post_result_filter": { - "popularity": "Popularity", - "newest": "Newest", - "relevance": "Relevance" + "popularity": "Népszerűség", + "newest": "Legújabb", + "relevance": "Fontosság" }, "other_result_filter": { "user": "Felhasználó", - "tag": "Tag" + "tag": "Címke" } }, "community": { - "new_post": "New Post", - "community": "community", - "details": "Details" + "new_post": "Új bejegyzés", + "community": "közösség", + "details": "Részletek" } } From a1b9289077df2597195f66784347af05d528274f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 14:47:00 +0200 Subject: [PATCH 013/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 25b5027410..bfda488cc3 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -93,18 +93,18 @@ }, "steem": { "title": "HIVE", - "buy": "GET HIVE" + "buy": "HIVE VÁSÁRLÁS" }, "sbd": { - "title": "HBD", - "buy": "GET HBD" + "title": "HDB", + "buy": "SBD VÁSÁRLÁS" }, "steem_power": { "title": "HIVE POWER" }, "btc": { "title": "BTC", - "buy": "GET BTC", + "buy": "BTC VÁSÁRLÁS", "address": "RECEIVE" } }, From 712c9ed3106064129c2ac3e704d41127e3435300 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 15:31:49 +0200 Subject: [PATCH 014/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index bfda488cc3..38235be3e7 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -231,7 +231,7 @@ "ref_user": "Ajánló felhasználó (opcionális)", "500_error": "Kérésedet nem sikerült feldolgozni, a regisztrációs sor valószínűleg megtelt! Próbálkozzon újra néhány perc múlva...", "title_description": "One account to manage everything", - "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." + "form_description": "Regisztrálással elfogadod a Felhasználói feltételeket és az Adatvédelmi szabályzatot." }, "home": { "feed": "Hírfolyam", @@ -289,12 +289,12 @@ "setting_beneficiary": "Kedvezményezett", "reward_default": "Alapértelmezett 50% / 50%", "reward_power_up": "100%-os Power Up", - "reward_decline": "Decline Payout", - "beneficiaries": "Beneficiaries", - "options": "Options", - "my_blog": "My Blog", - "my_communities": "My Communities", - "top_communities": "Top Communities" + "reward_decline": "Jutalom elutasítása", + "beneficiaries": "Kedvezményezettek", + "options": "Opciók", + "my_blog": "Saját blog", + "my_communities": "Az én közösségeim", + "top_communities": "Top közösségek" }, "pincode": { "enter_text": "Feloldáshoz írd be a PIN kódot", From 396a0e46e684fd26dc8dbeb045876db2918d4868 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 15:51:18 +0200 Subject: [PATCH 015/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 38235be3e7..ebb9b22cc8 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -313,7 +313,7 @@ "success_shared": "Success! Content submitted!", "success_moved": "Áthelyezve a vázlatokhoz", "permission_denied": "Engedély megtagadva", - "permission_text": "Please, go to phone Settings and change Ecency app permissions.", + "permission_text": "Kérlek módosítsd az Ecency alkalmazás engedélyezéseit a Beállítások-nál a telefonodon.", "key_warning": "Operation requires active key or master password, please relogin!", "success_rebloged": "Megosztva!", "already_rebloged": "Ezt már megosztottad!", From c6e615efdf68ddd2038968c488f171df2b65d2c8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 16:10:38 +0200 Subject: [PATCH 016/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index ebb9b22cc8..dc1f7de7d9 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -314,15 +314,15 @@ "success_moved": "Áthelyezve a vázlatokhoz", "permission_denied": "Engedély megtagadva", "permission_text": "Kérlek módosítsd az Ecency alkalmazás engedélyezéseit a Beállítások-nál a telefonodon.", - "key_warning": "Operation requires active key or master password, please relogin!", + "key_warning": "Ez a művelet aktív vagy master kulcsot igényel, kérlek jelentkezz be újra!", "success_rebloged": "Megosztva!", "already_rebloged": "Ezt már megosztottad!", "success_favorite": "Kedvencekhez hozzáadva!", "success_unfavorite": "Eltávolítva a kedvencektől!", "success_follow": "Sikeres követés!", "success_mute": "Sikeres némítás!", - "success_unmute": "Unmute success!", - "success_unfollow": "Unfollow success!", + "success_unmute": "Némítás sikeres feloldása!", + "success_unfollow": "Követés sikeres visszavonása!", "warning": "Figyelmeztetés", "invalid_pincode": "Érvénytelen PIN kód, kérjük ellenőrizd és próbáld újra.", "remove_alert": "Biztos, hogy törölni akarod?", @@ -338,11 +338,11 @@ "same_user": "Ez a felhasználó már szerepel a listán", "unknow_error": "Hiba történt", "error": "Hiba", - "fetch_error": "Connection issue, change server and restart", + "fetch_error": "Csatlakozási probléma, válts szervert és indítsd újra", "connection_fail": "Sikertelen kapcsolat!", "connection_success": "A kapcsolat sikerült!", "checking": "Ellenőrzés folyamatban...", - "external_link": "Open in Browser", + "external_link": "Megnyitás böngészőben", "not_existing_post": "A bejegyzés nem létezik! Kérjük ellenőrizd a linket és a szerzőt.", "google_play_version": "Észrevettük, hogy a készülékeden a Google Play régi verziója található. Kérjük frissítsd a Google Play szolgáltatásait és próbáld újra!", "rc_down": "Not enough resource credits to perform an action! \n\nBoost your account to continue enjoy the experience. Do you want to boost your account, now?", From 89a6311a80a690d53c7cb92dbf895ab06733b6e1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 16:32:49 +0200 Subject: [PATCH 017/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index dc1f7de7d9..4ad28f469d 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -345,10 +345,10 @@ "external_link": "Megnyitás böngészőben", "not_existing_post": "A bejegyzés nem létezik! Kérjük ellenőrizd a linket és a szerzőt.", "google_play_version": "Észrevettük, hogy a készülékeden a Google Play régi verziója található. Kérjük frissítsd a Google Play szolgáltatásait és próbáld újra!", - "rc_down": "Not enough resource credits to perform an action! \n\nBoost your account to continue enjoy the experience. Do you want to boost your account, now?", - "payloadTooLarge": "File size too big, please resize or upload smaller image", - "qoutaExceeded": "Upload quota exceeded", - "invalidImage": "Invalid image, try different file", + "rc_down": "Nincs elegendő erőforrás-jóváírásod ezen művelet végrehajtásához!\n\nPörgesd fel a fiókod, hogy továbbra is élvezhessd az élményt. Most szeretnéd belpörgetni a fiókodat?", + "payloadTooLarge": "A fájlméret túl nagy, kérlek méretezzd át, vagy tölts fel kisebb képet", + "qoutaExceeded": "Tárhely korlát túllépve", + "invalidImage": "Érvénytelen kép, próbálj egy másik fájlt", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", "something_wrong_reload": "Reload" From 3661d6ca0a6619744b1f00036bd7ccb9dd60d625 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 16:47:18 +0200 Subject: [PATCH 018/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 4ad28f469d..4784b2df03 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -349,13 +349,13 @@ "payloadTooLarge": "A fájlméret túl nagy, kérlek méretezzd át, vagy tölts fel kisebb képet", "qoutaExceeded": "Tárhely korlát túllépve", "invalidImage": "Érvénytelen kép, próbálj egy másik fájlt", - "something_wrong": "Something went wrong.", - "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong": "Valami hiba történt.", + "something_wrong_alt": "Próbáld ezt https://ecency.com", + "something_wrong_reload": "Frissítsd" }, "post": { "reblog_alert": "Biztos, hogy megosztod?", - "removed_hint": "Content is not available", + "removed_hint": "A tartalom nem elérhető", "copy_link": "Link másolása", "reblogged": "megosztva általa", "sponsored": "TÁMOGATOTT", @@ -363,8 +363,8 @@ "image": "Kép", "link": "Link", "gallery_mode": "Gallery mode", - "save_to_local": "Download to device", - "image_saved": "Image saved to Photo Gallery", + "save_to_local": "Letöltés a készülékre", + "image_saved": "Kép a galériába mentve", "image_saved_error": "Hiba a kép mentése közben", "wrong_link": "Nem megfelelő link" }, From 74874cbdab790bac8dc73bcfe9d06f6fe0177bf5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 17:17:14 +0200 Subject: [PATCH 019/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 4784b2df03..77ef3c704f 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -391,7 +391,7 @@ "add": "Hozzáadás a könyvjelzőkhöz" }, "report": { - "added": "Reported objectionable content" + "added": "Jelentett kifogásolható tartalom" }, "favorites": { "title": "Kedvencek", @@ -404,7 +404,7 @@ "invalid_username": "Érvénytelen felhasználónév, kérjük ellenőrizd és próbáld újra", "already_logged": "Már be vagy jelentkezve, kérjük próbálj meg hozzáadni egy másik fiókot", "invalid_credentials": "Érvénytelen hitelesítő adatok. Kérjük, ellenőrizd és próbáld újra", - "unknow_error": "Unknown error, please write to support@ecency.com" + "unknow_error": "Ismeretlen hiba, kérlek írj ide support@ecency.com" }, "payout": { "potential_payout": "Lehetséges Kifizetés", From a061aa3a93ee7adb09a391643338bf5e8f241715 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 17:30:59 +0200 Subject: [PATCH 020/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 77ef3c704f..12fc761cc8 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -362,7 +362,7 @@ "open_thread": "Üzenetsor megnyitása", "image": "Kép", "link": "Link", - "gallery_mode": "Gallery mode", + "gallery_mode": "Galéria mód", "save_to_local": "Letöltés a készülékre", "image_saved": "Kép a galériába mentve", "image_saved_error": "Hiba a kép mentése közben", @@ -451,17 +451,17 @@ "information": "Bistoz átutalod?", "amount_desc": "Egyenleg", "memo_desc": "Ez az üzenet nyilvános", - "convert_desc": "Convert takes 3.5 days and NOT recommended IF HBD price is higher than $1", + "convert_desc": "A konvertálás 3,5 napig tart és NEM ajánlott, HA a HDB ára nagyobb ming $1", "to_placeholder": "Felhasználónév", "memo_placeholder": "Megjegyzés ide", "transfer_token": "Átutalás", - "purchase_estm": "Purchase Points", - "convert": "Convert HBD to HIVE", - "points": "Gift Points to someone", + "purchase_estm": "Pont vásárlás", + "convert": "HDB konvertálás HIVE-ra", + "points": "Ajándékozz Pontokat valakinek", "transfer_to_saving": "Átutalás a megtakarításokhoz", "powerUp": "Power Up", "withdraw_to_saving": "Átutalás A Megtakarításokhoz", - "steemconnect_title": "Hivesigner Transfer", + "steemconnect_title": "Hivesigner átutalás", "estimated_weekly": "Heti becslés", "destination_accounts": "Cél Fiókok", "stop_information": "Bistos megállítod?", @@ -472,11 +472,11 @@ "next": "KÖVETKEZŐ", "delegate": "Delegálás", "power_down": "Power Down", - "withdraw_steem": "Withdraw HIVE", - "withdraw_sbd": "Withdraw HIVE Dollar", + "withdraw_steem": "HIVE visszavonás", + "withdraw_sbd": "HIVE Dollár visszavonás", "incoming_funds": "Bejövő tőke", "stop": "Megállítás", - "address_view": "View address" + "address_view": "Cím megtekintése" }, "boost": { "title": "Get Points", From c8a1df4c9622ff9c146477ab8fb9558b39f3774f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 17:38:30 +0200 Subject: [PATCH 021/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 12fc761cc8..b3df193857 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -105,7 +105,7 @@ "btc": { "title": "BTC", "buy": "BTC VÁSÁRLÁS", - "address": "RECEIVE" + "address": "KAP" } }, "notification": { @@ -230,7 +230,7 @@ "mail": "Add meg az e-mail címed", "ref_user": "Ajánló felhasználó (opcionális)", "500_error": "Kérésedet nem sikerült feldolgozni, a regisztrációs sor valószínűleg megtelt! Próbálkozzon újra néhány perc múlva...", - "title_description": "One account to manage everything", + "title_description": "Egy fiók mindenre", "form_description": "Regisztrálással elfogadod a Felhasználói feltételeket és az Adatvédelmi szabályzatot." }, "home": { @@ -310,7 +310,7 @@ "fail": "Sikertelen!", "move": "Áthelyezés", "move_question": "Biztos, hogy áthelyezed a piszkozatokhoz?", - "success_shared": "Success! Content submitted!", + "success_shared": "Siker! Tartalom közzétéve!", "success_moved": "Áthelyezve a vázlatokhoz", "permission_denied": "Engedély megtagadva", "permission_text": "Kérlek módosítsd az Ecency alkalmazás engedélyezéseit a Beállítások-nál a telefonodon.", @@ -424,7 +424,7 @@ "bookmarks": "hozzáadás a könyvjelzőkhöz", "promote": "hirdetés", "boost": "felpörgetés", - "report": "report" + "report": "jelentés" }, "deep_link": { "no_existing_user": "Nem létező felhasználó", From 0d4e4c3a0d89c9e21e7932cd5a19592e5f029409 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 17:47:17 +0200 Subject: [PATCH 022/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index b3df193857..8beb79965d 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -6,7 +6,7 @@ "claim_reward_balance": "Jutalmak átvevése ", "transfer": "Átutalás", "transfer_to_vesting": "To Vesting", - "transfer_from_savings": "From Savings", + "transfer_from_savings": "A megtakarításoktól", "withdraw_vesting": "Power Down", "fill_order": "Megrendelés Kitöltése", "post": "Bejegyzés", @@ -21,7 +21,7 @@ "delegation": "Delegálás", "delegations": "Delegálások", "delegation_title": "Delegálási jutalom", - "delegation_desc": "Earn Points everyday for delegation", + "delegation_desc": "Nyerj naponta Pontokat delegálásért", "post_title": "Bejegyzés pontok", "comment_title": "Hozzászólás pontok", "vote_title": "Szavazási pontok", @@ -480,11 +480,11 @@ }, "boost": { "title": "Get Points", - "buy": "GET Points", + "buy": "VÁSÁROLJ Pontokat", "next": "KÖVETKEZŐ", "account": { "title": "Get Account Boost", - "desc": "30 days delegation will boost your votes and social activities and give you more actions with more Resource Credits." + "desc": "A 30 napos delegálás növelni fogja a szavazataidat, közösségi tevékenységeidet és több cselekvést engedélyez több erőforrás-jóváírás segítségével." } }, "free_estm": { From fd1a331e7827cbad7eb56dbcfd4c29d1eba1147f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 17:57:21 +0200 Subject: [PATCH 023/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 8beb79965d..cef963f755 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -2,10 +2,10 @@ "wallet": { "curation_reward": "Kuráció Jutalom", "author_reward": "Szerzői Jutalom", - "comment_benefactor_reward": "Benefactor Reward", + "comment_benefactor_reward": "Jótevői jutalom", "claim_reward_balance": "Jutalmak átvevése ", "transfer": "Átutalás", - "transfer_to_vesting": "To Vesting", + "transfer_to_vesting": "A Vesting-be", "transfer_from_savings": "A megtakarításoktól", "withdraw_vesting": "Power Down", "fill_order": "Megrendelés Kitöltése", @@ -479,7 +479,7 @@ "address_view": "Cím megtekintése" }, "boost": { - "title": "Get Points", + "title": "Szerezz Pontokat", "buy": "VÁSÁROLJ Pontokat", "next": "KÖVETKEZŐ", "account": { From affbac1efc358dfeca3c1c0812c31c3d2b2a69c9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 18:07:27 +0200 Subject: [PATCH 024/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index cef963f755..b4fe766c09 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -3,7 +3,7 @@ "curation_reward": "Kuráció Jutalom", "author_reward": "Szerzői Jutalom", "comment_benefactor_reward": "Jótevői jutalom", - "claim_reward_balance": "Jutalmak átvevése ", + "claim_reward_balance": "Jutalom átvétele ", "transfer": "Átutalás", "transfer_to_vesting": "A Vesting-be", "transfer_from_savings": "A megtakarításoktól", @@ -483,7 +483,7 @@ "buy": "VÁSÁROLJ Pontokat", "next": "KÖVETKEZŐ", "account": { - "title": "Get Account Boost", + "title": "Fiók felpörgetés", "desc": "A 30 napos delegálás növelni fogja a szavazataidat, közösségi tevékenységeidet és több cselekvést engedélyez több erőforrás-jóváírás segítségével." } }, From 3664de1966fdfb6cd09638e1844b6160b192d257 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 18:07:29 +0200 Subject: [PATCH 025/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 628c91820d..d665edf3ad 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -279,7 +279,7 @@ "limited_tags": "Na only ten tags we fit accept, comot d extra wey dey", "limited_length": "The tag no gaz pass 24", "limited_dash": "Na only one dash u fit use for one tag", - "limited_space": "Use space to separate tags", + "limited_space": "Let space gap dem tags", "limited_lowercase": "Only use lower letters in tag", "limited_characters": "Use only lowercase letters, digits and one dash", "limited_firstchar": "Tag must start with a letter", From e557259a50f787ca99e0685cb993d8601459270f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 18:17:47 +0200 Subject: [PATCH 026/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index b4fe766c09..96c6f1acc6 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -21,7 +21,7 @@ "delegation": "Delegálás", "delegations": "Delegálások", "delegation_title": "Delegálási jutalom", - "delegation_desc": "Nyerj naponta Pontokat delegálásért", + "delegation_desc": "Nyerj Pontokat naponta delegálásért", "post_title": "Bejegyzés pontok", "comment_title": "Hozzászólás pontok", "vote_title": "Szavazási pontok", From f3baf9c2b66b3ca7db76d620e948f697947105e5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 18:17:49 +0200 Subject: [PATCH 027/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index d665edf3ad..09ee42a3d3 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -280,21 +280,21 @@ "limited_length": "The tag no gaz pass 24", "limited_dash": "Na only one dash u fit use for one tag", "limited_space": "Let space gap dem tags", - "limited_lowercase": "Only use lower letters in tag", - "limited_characters": "Use only lowercase letters, digits and one dash", - "limited_firstchar": "Tag must start with a letter", - "limited_lastchar": "Tag must end with letter or number", - "setting_schedule": "Scheduling Time", - "setting_reward": "Reward", - "setting_beneficiary": "Beneficiary", - "reward_default": "Default 50% / 50%", - "reward_power_up": "Power Up 100%", - "reward_decline": "Decline Payout", - "beneficiaries": "Beneficiaries", - "options": "Options", - "my_blog": "My Blog", - "my_communities": "My Communities", - "top_communities": "Top Communities" + "limited_lowercase": "Use dem smally letters for d tag", + "limited_characters": "Use only dem smally letters, numbers and one dash", + "limited_firstchar": "You gaz make sure say na letter begin tag", + "limited_lastchar": "Tag gaz end with letter or number", + "setting_schedule": "D tym wey u tell am make e run", + "setting_reward": "Ur gain", + "setting_beneficiary": "Who go get am", + "reward_default": "As e be 50% / 50%", + "reward_power_up": "Carry everything stake 100%", + "reward_decline": "No collect ur gain", + "beneficiaries": "Dose people wey go get am", + "options": "Plenty way", + "my_blog": "My personal blog dem", + "my_communities": "Una areas", + "top_communities": "Areas wey dey lead" }, "pincode": { "enter_text": "Enter your PIN to open am", From d2f6ed6c0f1b2f18208c0009cc89e2dd6dcd35ed Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 18:27:42 +0200 Subject: [PATCH 028/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 09ee42a3d3..7c9089d302 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -310,19 +310,19 @@ "fail": "E Fail oo!", "move": "Move", "move_question": "You sure say you won move am go draft?", - "success_shared": "Success! Content submitted!", + "success_shared": "Confam! Your thing don enta!", "success_moved": "E don move go draft", "permission_denied": "E no gree do", - "permission_text": "Please, go to phone Settings and change Ecency app permissions.", - "key_warning": "Operation requires active key or master password, please relogin!", + "permission_text": "Abeg go fone Settings go change Ecency app permissions.", + "key_warning": "Dis ting need ur active key or master key, try enta again!", "success_rebloged": "E don reblog!", "already_rebloged": "You don reblog am already!", - "success_favorite": "Favorite added!", - "success_unfavorite": "Favorite removed!", - "success_follow": "Follow success!", - "success_mute": "Mute success!", - "success_unmute": "Unmute success!", - "success_unfollow": "Unfollow success!", + "success_favorite": "We don add wetin u like!", + "success_unfavorite": "We don comot wetin u like!", + "success_follow": "Ur follow don confam!", + "success_mute": "We don confam say u no wan hear from am again!", + "success_unmute": "You wan dey hear from am don confam!", + "success_unfollow": "U no follow again don confam!", "warning": "Warning", "invalid_pincode": "Your PIN code no correct, abeg check wella and try am again", "remove_alert": "You sure say you wan remove am?", @@ -335,18 +335,18 @@ "no_internet": "Connection no dey!", "confirm": "Confam", "removed": "E don remove", - "same_user": "This user already added to list", - "unknow_error": "An error occurred", - "error": "Error", - "fetch_error": "Connection issue, change server and restart", - "connection_fail": "Connection Failed!", - "connection_success": "Successfully connected!", - "checking": "Checking...", - "external_link": "Open in Browser", - "not_existing_post": "The post does not exist! Please check permlink and author.", - "google_play_version": "We noticed that your device has old version of Google Play. Please update Google Play services and try again!", - "rc_down": "Not enough resource credits to perform an action! \n\nBoost your account to continue enjoy the experience. Do you want to boost your account, now?", - "payloadTooLarge": "File size too big, please resize or upload smaller image", + "same_user": "U don put dis person for list before", + "unknow_error": "Gbege don shele", + "error": "Gbege", + "fetch_error": "E no dey connect, go anoda server make u restart am", + "connection_fail": "Connection no work!", + "connection_success": "E don connect confam!", + "checking": "E dey look am...", + "external_link": "Check am for browser", + "not_existing_post": "Dis post no dey dis lyf! Biko look d permlink and person wey post am.", + "google_play_version": "We see say ur fone dey use Google Play wey don tey. Biko put chacha Google Play services make u check am again!", + "rc_down": "Dem resource credits no reach to do dis tin!\n\nPut more for ur account make u fit dey gbadun dis flexing. You wan put more for ur account now?", + "payloadTooLarge": "Dis file na bigibigi, biko make am small or make u put picture wey no too big", "qoutaExceeded": "Upload quota exceeded", "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", From 74b82844e1c4ba50e4aa01ef771260508a00e903 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 18:37:44 +0200 Subject: [PATCH 029/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 7c9089d302..e4f3ee3115 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -347,15 +347,15 @@ "google_play_version": "We see say ur fone dey use Google Play wey don tey. Biko put chacha Google Play services make u check am again!", "rc_down": "Dem resource credits no reach to do dis tin!\n\nPut more for ur account make u fit dey gbadun dis flexing. You wan put more for ur account now?", "payloadTooLarge": "Dis file na bigibigi, biko make am small or make u put picture wey no too big", - "qoutaExceeded": "Upload quota exceeded", - "invalidImage": "Invalid image, try different file", - "something_wrong": "Something went wrong.", - "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "qoutaExceeded": "Dis tin don pass Upload quota", + "invalidImage": "Dis picture no get, look anoda one", + "something_wrong": "Something don happen.", + "something_wrong_alt": "You fit check https://ecency.com", + "something_wrong_reload": "Try am again" }, "post": { - "reblog_alert": "Are you sure, you want to reblog?", - "removed_hint": "Content is not available", + "reblog_alert": "You sure say you wan reblog am?", + "removed_hint": "Dis tin no dey oo", "copy_link": "Copy link", "reblogged": "reblogged by", "sponsored": "SPONSORED", From cddee509a4b5caab9dc3387b4b421272dbd5c79e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 18:46:45 +0200 Subject: [PATCH 030/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 60 +++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index e4f3ee3115..ab210e344e 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -356,11 +356,11 @@ "post": { "reblog_alert": "You sure say you wan reblog am?", "removed_hint": "Dis tin no dey oo", - "copy_link": "Copy link", - "reblogged": "reblogged by", - "sponsored": "SPONSORED", - "open_thread": "Open thread", - "image": "Image", + "copy_link": "Double d link for use", + "reblogged": "person wey reblog am na", + "sponsored": "NA SPONSOR", + "open_thread": "Look d thread", + "image": "Picture", "link": "Link", "gallery_mode": "Gallery mode", "save_to_local": "Download to device", @@ -490,54 +490,54 @@ "free_estm": { "title": "Free Points", "button": "SPIN & WIN", - "get_spin": "5 SPINS", - "spin_right": "Spin Left", - "timer_text": "Next free spin in" + "get_spin": "DEM 5 SPINS", + "spin_right": "Spin am for ur left", + "timer_text": "D next spin in wey we dash" }, "promote": { - "title": "Promote", - "days": "days", - "user": "User", - "permlink": "Post", - "permlinkPlaceholder": "username/permlink", - "information": "Are you sure to promote?" + "title": "Loud am", + "days": "dem days", + "user": "Person", + "permlink": "Tori", + "permlinkPlaceholder": "person name/permlink", + "information": "You sure say you wan promote am?" }, "boostPost": { - "title": "Boost" + "title": "Give am push" }, "voters_dropdown": { - "rewards": "REWARDS", + "rewards": "DEM GAINS", "percent": "PERCENT", "time": "TIME" }, "reblog": { - "title": "Reblog Info" + "title": "Informate of wetin u reblog" }, "dsteem": { "date_error": { - "device_time": "Your device time;", - "current_time": "Current time;", - "information": "We noticed that your device has incorrect date or time. Please fix Date & Time or Set Automatically and try again." + "device_time": "D time wey ur fone dey talk;", + "current_time": "D time for now;", + "information": "We observe say ur fone date and time no be confam. Biko make d date and time confam or make computer do am for u den try for once." } }, "comments": { "title": "Comments", - "reveal_comment": "Reveal comment", - "read_more": "Read more comments", - "more_replies": "more replies" + "reveal_comment": "Show dis comment", + "read_more": "Check dem comments", + "more_replies": "dem replies wey remain" }, "search_result": { - "others": "Others", + "others": "Dem odas", "communities": { - "title": "Communities", - "subscribe": "Join", - "unsubscribe": "Leave", - "subscribers": "Members", - "posters": "Posters", + "title": "Una areas", + "subscribe": "Enta", + "unsubscribe": "Comot", + "subscribers": "Dem people wey dey area", + "posters": "Dem people wey dey post", "posts": "Post" }, "communities_filter": { - "my": "My Communities", + "my": "My areas dem", "rank": "Rank", "subs": "Members", "new": "New" From 8f50580bd7f7dc49e65d72661d2959435ca93417 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 19:06:12 +0200 Subject: [PATCH 031/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 96c6f1acc6..5ff823de1b 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -63,13 +63,13 @@ "points": "Ajándékozz Pontokat valakinek", "transfer_to_saving": "A megtakarításokhoz", "powerUp": "Power Up", - "withdraw_to_saving": "Átutalás a Megtakarításokhoz", + "withdraw_to_saving": "Megtakarítás visszavonás", "steemconnect_title": "Hivesigner átutalás", "next": "KÖVETKEZŐ", "delegate": "Delegálás", "power_down": "Power Down", - "withdraw_steem": "Hive Visszavonás", - "withdraw_sbd": "HBD Visszavonás", + "withdraw_steem": "HIVE visszavonás", + "withdraw_sbd": "HBD visszavonás", "transfer_to_savings": "A megtakarításokhoz", "convert": "Konvertálás", "escrow_transfer": "Letéti átutalás", @@ -78,18 +78,18 @@ "escrow_approve": "Letéti jóváhagyás", "cancel_transfer_from_savings": "A megtakarításoktól való átutalás törlése", "delegate_vesting_shares": "Delegálás", - "fill_convert_request": "Átváltás végrehajtva", + "fill_convert_request": "Konvertálás végrehajtva", "fill_transfer_from_savings": "A megtakarításoktól végrehajtva", "fill_vesting_withdraw": "PowerDown végrehajtva", "estm": { "title": "Pontok", - "buy": "SZEREZZ PONTOKAT" + "buy": "VÁSÁROLJ PONTOKAT" }, "savingsteem": { - "title": "HIVE Megtakarítások" + "title": "HIVE megtakarítások" }, "savingsbd": { - "title": "HBD Megtakarítások" + "title": "HBD megtakarítások" }, "steem": { "title": "HIVE", @@ -158,8 +158,8 @@ "hours": "órák", "voting_power": "Szavazóerő", "login_to_see": "A megtekintéshez jelentkezz be", - "follow_people": "Kövess néhány felhasználót, hogy töltsd meg a hírcsatornád", - "follow_communities": "Csatalkozz néhány közösséghez, hogy betöltsd a hírcsatornádat", + "follow_people": "Kövess néhány felhasználót, hogy töltsd be a hírcsatornád", + "follow_communities": "Csatalkozz néhány közösséghez, hogy betöltsd a hírcsatornád", "havent_commented": "még nem szólt hozzá semmihez", "havent_posted": "még nem tett közzé semmit", "steem_power": "Hive Power", From 9cf45fa856582f987a78935b8e5d358a7e35fdaf Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 19:06:14 +0200 Subject: [PATCH 032/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index ab210e344e..9411260b8e 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -538,23 +538,23 @@ }, "communities_filter": { "my": "My areas dem", - "rank": "Rank", - "subs": "Members", - "new": "New" + "rank": "Wia I dey", + "subs": "Dem people wey dey area", + "new": "Wey new" }, "post_result_filter": { - "popularity": "Popularity", - "newest": "Newest", - "relevance": "Relevance" + "popularity": "Wey people enjoy pass", + "newest": "Wey new pass", + "relevance": "As e important reach" }, "other_result_filter": { - "user": "User", + "user": "Person", "tag": "Tag" } }, "community": { - "new_post": "New Post", - "community": "community", - "details": "Details" + "new_post": "Post wey new", + "community": "area", + "details": "Full informate" } } From 14c2fe310e2a2ccfe1ebba8ec1d2ab3671f886ab Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 19:18:05 +0200 Subject: [PATCH 033/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 5ff823de1b..82d61f2b6c 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -214,10 +214,10 @@ "login": { "signin": "Bejelentkezés", "signup": "CSATLAKOZZ MOST", - "signin_title": "Jelentkezz be ahhoz, hogy minden előnyben részesülj", + "signin_title": "Ahhoz, hogy az Ecency minden előnyét élvezd", "username": "Felhasználónév", "password": "Jelszó vagy a WIF", - "description": "Regisztrálással elfogadod a Felhasználói feltételeket és az Adatvédelmi szabályzatot.", + "description": "Bejelentkezéssel elfogadod a Felhasználói feltételeket és az Adatvédelmi szabályzatot.", "cancel": "visszavonom", "login": "BEJELENTKEZÉS", "steemconnect_description": "Ha nem szeretnéd a jelszavad a készülékeden elmentve tárolni, használhatod a Hivesigner-t.", From 39f8cfd088e48ec7399341feb9b63731057a8662 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 19:26:15 +0200 Subject: [PATCH 034/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 82d61f2b6c..527fe5d9bf 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -280,10 +280,10 @@ "limited_length": "Címkék maximális hossza 24 lehet", "limited_dash": "Használj egy kötőjelet minden címkében", "limited_space": "A címkék elválasztásához használj szóközt", - "limited_lowercase": "Csak kisbetüt használj a címkékhez", + "limited_lowercase": "Csak kisbetűt használj a címkéhez", "limited_characters": "Csak kisbetűt, számjegyeket és egy kötőjelet használj", "limited_firstchar": "A címkének betűvel kell kezdődnie", - "limited_lastchar": "A címkéknek betűvel vagy számmal kell végződnie", + "limited_lastchar": "A címkének betűvel vagy számmal kell végződnie", "setting_schedule": "Beütemezési időpont", "setting_reward": "Jutalom", "setting_beneficiary": "Kedvezményezett", From df6b2d76063ef6027da716f10e43e31c4cbbe5b5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 15 Dec 2020 19:36:11 +0200 Subject: [PATCH 035/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 527fe5d9bf..55f5be64d6 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -293,7 +293,7 @@ "beneficiaries": "Kedvezményezettek", "options": "Opciók", "my_blog": "Saját blog", - "my_communities": "Az én közösségeim", + "my_communities": "Közösségeim", "top_communities": "Top közösségek" }, "pincode": { @@ -318,7 +318,7 @@ "success_rebloged": "Megosztva!", "already_rebloged": "Ezt már megosztottad!", "success_favorite": "Kedvencekhez hozzáadva!", - "success_unfavorite": "Eltávolítva a kedvencektől!", + "success_unfavorite": "Kedvencektől eltávolítva!", "success_follow": "Sikeres követés!", "success_mute": "Sikeres némítás!", "success_unmute": "Némítás sikeres feloldása!", @@ -346,7 +346,7 @@ "not_existing_post": "A bejegyzés nem létezik! Kérjük ellenőrizd a linket és a szerzőt.", "google_play_version": "Észrevettük, hogy a készülékeden a Google Play régi verziója található. Kérjük frissítsd a Google Play szolgáltatásait és próbáld újra!", "rc_down": "Nincs elegendő erőforrás-jóváírásod ezen művelet végrehajtásához!\n\nPörgesd fel a fiókod, hogy továbbra is élvezhessd az élményt. Most szeretnéd belpörgetni a fiókodat?", - "payloadTooLarge": "A fájlméret túl nagy, kérlek méretezzd át, vagy tölts fel kisebb képet", + "payloadTooLarge": "A fájlméret túl nagy, kérlek méretezd át, vagy tölts fel kisebb képet", "qoutaExceeded": "Tárhely korlát túllépve", "invalidImage": "Érvénytelen kép, próbálj egy másik fájlt", "something_wrong": "Valami hiba történt.", From f1ee6b571b75dfc8faae4114f5c722d7ce8db221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Tue, 15 Dec 2020 22:29:26 +0300 Subject: [PATCH 036/505] Add CommunityListItem, getCommunities&getLeaderboard request to postsContainer --- src/components/basicUIElements/index.js | 2 + .../communityListItem/communityListItem.js | 40 +++++++ .../communityListItemStyles.js | 48 ++++++++ .../view/userListItem/userListItem.js | 2 + .../view/selectCommunityAreaView.js | 2 +- .../view/selectCommunityModalStyles.js | 3 + .../view/selectCommunityModalView.js | 9 +- .../posts/container/postsContainer.js | 32 +++++- src/components/posts/view/postsStyles.js | 4 + src/components/posts/view/postsView.js | 107 ++++++++++++++---- .../searchInput/view/searchInputView.js | 3 +- src/constants/options/filters.js | 2 +- 12 files changed, 228 insertions(+), 26 deletions(-) create mode 100644 src/components/basicUIElements/view/communityListItem/communityListItem.js create mode 100644 src/components/basicUIElements/view/communityListItem/communityListItemStyles.js diff --git a/src/components/basicUIElements/index.js b/src/components/basicUIElements/index.js index 74f0174f99..14a7115e55 100644 --- a/src/components/basicUIElements/index.js +++ b/src/components/basicUIElements/index.js @@ -9,6 +9,7 @@ import Tag from './view/tag/tagContainer'; import TextWithIcon from './view/textWithIcon/textWithIconView'; import UserListItem from './view/userListItem/userListItem'; import WalletLineItem from './view/walletLineItem/walletLineItemView'; +import CommunityListItem from './view/communityListItem/communityListItem'; // Placeholders import ListItemPlaceHolder from './view/placeHolder/listItemPlaceHolderView'; @@ -40,6 +41,7 @@ export { Tag, TextWithIcon, UserListItem, + CommunityListItem, WalletDetailsPlaceHolder, WalletLineItem, WalletUnclaimedPlaceHolder, diff --git a/src/components/basicUIElements/view/communityListItem/communityListItem.js b/src/components/basicUIElements/view/communityListItem/communityListItem.js new file mode 100644 index 0000000000..cd9c21ec3d --- /dev/null +++ b/src/components/basicUIElements/view/communityListItem/communityListItem.js @@ -0,0 +1,40 @@ +import React from 'react'; +import { View, Text, TouchableOpacity } from 'react-native'; +import { useIntl } from 'react-intl'; + +import { UserAvatar } from '../../../userAvatar'; +import { Tag } from '../../index'; + +import DEFAULT_IMAGE from '../../../../assets/no_image.png'; + +import styles from './communityListItemStyles'; + +const CommunityListItem = ({ item, index, handleOnPress, handleSubscribeButtonPress }) => { + const intl = useIntl(); + return ( + + + handleOnPress(item[0])}> + + + handleOnPress(item[0])}> + {item[1]} + + + + handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] })} + /> + + + ); +}; + +export default CommunityListItem; diff --git a/src/components/basicUIElements/view/communityListItem/communityListItemStyles.js b/src/components/basicUIElements/view/communityListItem/communityListItemStyles.js new file mode 100644 index 0000000000..6fe3db6757 --- /dev/null +++ b/src/components/basicUIElements/view/communityListItem/communityListItemStyles.js @@ -0,0 +1,48 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + backgroundColor: '$primaryBackgroundColor', + }, + itemWrapper: { + paddingHorizontal: 16, + paddingTop: 16, + paddingBottom: 8, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + flexDirection: 'row', + alignItems: 'center', + }, + itemWrapperGray: { + backgroundColor: '$primaryLightBackground', + }, + username: { + marginLeft: 10, + color: '$primaryBlack', + }, + communityWrapper: { + paddingHorizontal: 16, + paddingTop: 10, + paddingBottom: 10, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + flexDirection: 'row', + alignItems: 'center', + flex: 1, + }, + subscribeButton: { + maxWidth: 75, + borderWidth: 1, + borderColor: '$primaryBlue', + }, + subscribeButtonText: { + textAlign: 'center', + color: '$primaryBlue', + }, + community: { + justifyContent: 'center', + marginLeft: 15, + color: '$primaryBlack', + }, +}); diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index a073b4380d..194df1644c 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -20,6 +20,7 @@ const UserListItem = ({ text, middleText, rightTextStyle, + onPressRightText, }) => ( handleOnLongPress && handleOnLongPress()} @@ -55,6 +56,7 @@ const UserListItem = ({ isBlackRightColor && styles.valueBlack, rightTextStyle, ]} + onPress={onPressRightText} > {rightText} diff --git a/src/components/editorElements/selectCommunityArea/view/selectCommunityAreaView.js b/src/components/editorElements/selectCommunityArea/view/selectCommunityAreaView.js index d121dd6716..c0eb2d55d5 100644 --- a/src/components/editorElements/selectCommunityArea/view/selectCommunityAreaView.js +++ b/src/components/editorElements/selectCommunityArea/view/selectCommunityAreaView.js @@ -1,4 +1,4 @@ -import React, { useEffect } from 'react'; +import React from 'react'; import { TouchableOpacity, Text } from 'react-native'; import { injectIntl } from 'react-intl'; diff --git a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js index 29332efa64..a8d82efc8b 100644 --- a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js +++ b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js @@ -1,6 +1,9 @@ import EStyleSheet from 'react-native-extended-stylesheet'; export default EStyleSheet.create({ + searchInput: { + marginTop: 16, + }, searchedFlatList: { marginTop: 16, }, diff --git a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js index 8711c9cfde..544444517f 100644 --- a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js +++ b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js @@ -1,5 +1,5 @@ import React from 'react'; -import { View, Text, ScrollView, FlatList } from 'react-native'; +import { View, Text, ScrollView, FlatList, Platform } from 'react-native'; import { injectIntl } from 'react-intl'; import CommunityCard from '../../../communityCard'; @@ -21,7 +21,12 @@ const SelectCommunityModalView = ({ }) => { return ( - + {showSearchedCommunities ? ( } diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index d0cee87d3a..3ae0471d7e 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -6,7 +6,8 @@ import Matomo from 'react-native-matomo-sdk'; // HIVE import { getAccountPosts, getPost, getRankedPosts } from '../../../providers/hive/dhive'; -import { getPromotePosts } from '../../../providers/ecency/ecency'; +import { getCommunities } from '../../../providers/hive/hive'; +import { getPromotePosts, getLeaderboard } from '../../../providers/ecency/ecency'; // Component import PostsView from '../view/postsView'; @@ -56,6 +57,8 @@ const PostsContainer = ({ const [selectedFeedSubfilterValue, setSelectedFeedSubfilterValue] = useState( feedSubfilterOptionsValue && feedSubfilterOptions[selectedFeedSubfilterIndex], ); + const [recommendedUsers, setRecommendedUsers] = useState([]); + const [recommendedCommunities, setRecommendedCommunities] = useState([]); const elem = useRef(null); const isMountedRef = useIsMountedRef(); @@ -288,6 +291,29 @@ const PostsContainer = ({ setIsNoPost(false); }; + const _getRecommendedUsers = () => { + getLeaderboard() + .then((users) => { + const recommendeds = users.slice(0, 10); + recommendeds.unshift({ _id: 'good-karma' }); + recommendeds.unshift({ _id: 'ecency' }); + + setRecommendedUsers(recommendeds); + }) + .catch((err) => console.log(err, '_getRecommendedUsers Error')); + }; + + const _getRecommendedCommunities = () => { + getCommunities('', 10) + .then((communities) => { + const recommendeds = [...communities]; + recommendeds.unshift({ title: 'Ecency', name: 'hive-125125' }); + + setRecommendedCommunities(recommendeds); + }) + .catch((err) => console.log(err, '_getRecommendedUsers Error')); + }; + return ( ); }; diff --git a/src/components/posts/view/postsStyles.js b/src/components/posts/view/postsStyles.js index abd373592c..91dcfacd4a 100644 --- a/src/components/posts/view/postsStyles.js +++ b/src/components/posts/view/postsStyles.js @@ -35,4 +35,8 @@ export default EStyleSheet.create({ placeholderWrapper: { flex: 1, }, + noPostTitle: { + textAlign: 'center', + marginVertical: 16, + }, }); diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index 464b5c2bfc..f716a74ec5 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -1,6 +1,6 @@ /* eslint-disable react/jsx-wrap-multilines */ -import React, { useRef } from 'react'; -import { FlatList, View, ActivityIndicator, RefreshControl } from 'react-native'; +import React, { useRef, useEffect } from 'react'; +import { FlatList, View, ActivityIndicator, RefreshControl, Text } from 'react-native'; import { useIntl } from 'react-intl'; import { withNavigation } from 'react-navigation'; import { get } from 'lodash'; @@ -8,12 +8,13 @@ import { get } from 'lodash'; // COMPONENTS import { PostCard } from '../../postCard'; import { FilterBar } from '../../filterBar'; -import { PostCardPlaceHolder, NoPost } from '../../basicUIElements'; +import { PostCardPlaceHolder, NoPost, UserListItem } from '../../basicUIElements'; import { ThemeContainer } from '../../../containers'; // Styles import styles from './postsStyles'; import { default as ROUTES } from '../../../constants/routeNames'; +import globalStyles from '../../../globalStyles'; let _onEndReachedCalledDuringMomentum = true; @@ -44,10 +45,27 @@ const PostsView = ({ handleFeedSubfilterOnDropdownSelect, setSelectedFeedSubfilterValue, selectedFeedSubfilterValue, + getRecommendedUsers, + getRecommendedCommunities, + recommendedUsers, + recommendedCommunities, }) => { const intl = useIntl(); const postsList = useRef(null); + useEffect(() => { + console.log('useEffect', isNoPost, selectedFilterValue, selectedFeedSubfilterValue); + if (isNoPost) { + if (selectedFilterValue === 'feed') { + if (selectedFeedSubfilterValue === 'friends') { + getRecommendedUsers(); + } else { + getRecommendedCommunities(); + } + } + } + }, [isNoPost, selectedFilterValue, selectedFeedSubfilterValue]); + const _handleFilterOnDropdownSelect = async (index) => { if (index === selectedFilterIndex) { _scrollTop(); @@ -103,23 +121,72 @@ const PostsView = ({ } if (isNoPost) { - return ( - - ); + if (selectedFilterValue === 'feed') { + if (selectedFeedSubfilterValue === 'friends') { + return ( + <> + + {intl.formatMessage({ id: 'profile.follow_people' })} + + ( + { + console.log('users pressed'); + }} + /> + )} + /> + + ); + } else { + console.log(recommendedCommunities, 'recommendedCommunities'); + return ( + <> + + {intl.formatMessage({ id: 'profile.follow_communities' })} + + ( + { + console.log('users pressed'); + }} + /> + )} + /> + + ); + } + } else { + return {intl.formatMessage({ id: 'profile.havent_posted' })}; + } + // } return ( diff --git a/src/components/searchInput/view/searchInputView.js b/src/components/searchInput/view/searchInputView.js index 629dc26759..5ce9b0f61f 100644 --- a/src/components/searchInput/view/searchInputView.js +++ b/src/components/searchInput/view/searchInputView.js @@ -22,8 +22,9 @@ const SearchInputView = ({ placeholder, editable = true, autoFocus = true, + style, }) => ( - + Date: Wed, 16 Dec 2020 06:44:34 +0200 Subject: [PATCH 037/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 48 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 9411260b8e..2c0c704f19 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -362,11 +362,11 @@ "open_thread": "Look d thread", "image": "Picture", "link": "Link", - "gallery_mode": "Gallery mode", - "save_to_local": "Download to device", - "image_saved": "Image saved to Photo Gallery", - "image_saved_error": "Error Saving Image", - "wrong_link": "Wrong link" + "gallery_mode": "Mode of wia picture dey", + "save_to_local": "Collect am enta fone", + "image_saved": "Keep image put for wia e dey save", + "image_saved_error": "Gbege don happen as e dey save picture", + "wrong_link": "Dis link no be am" }, "drafts": { "title": "Draft", @@ -391,7 +391,7 @@ "add": "Add am to bookmark" }, "report": { - "added": "Reported objectionable content" + "added": "Tell Oga dem for dis content wey dey objectionable" }, "favorites": { "title": "Favorites", @@ -404,7 +404,7 @@ "invalid_username": "Your guy-name no correct, abeg check am and try again ", "already_logged": "You don dey inside your account already, abeg try add another account join", "invalid_credentials": "Wrong information, abeg check wella and try am again", - "unknow_error": "Unknown error, please write to support@ecency.com" + "unknow_error": "Error don happen, abeg holla us for support@ecency.com" }, "payout": { "potential_payout": "Reward wey dey pending", @@ -412,9 +412,9 @@ "author_payout": "Payment For Person Wey Write", "curation_payout": "Payment For Post Wey You Upvote", "payout_date": "Payment", - "beneficiaries": "Beneficiaries", - "warn_zero_payout": "Amount must reach $0.02 for payout", - "breakdown": "Breakdown" + "beneficiaries": "Dose people wey go get am", + "warn_zero_payout": "Dis money gaz enta $0.02 for cashout", + "breakdown": "Evrything selense" }, "post_dropdown": { "copy": "copy the link", @@ -422,9 +422,9 @@ "reply": "reply am", "share": "share am", "bookmarks": "add am to bookmark", - "promote": "promote", - "boost": "boost", - "report": "report" + "promote": "loud am", + "boost": "give am push", + "report": "tell Oga" }, "deep_link": { "no_existing_user": "The person no exist", @@ -435,28 +435,28 @@ "comments": "Comments" }, "comment_filter": { - "trending": "TOP", - "reputation": "REPUTATION", - "votes": "VOTE", - "age": "AGE", - "top": "TOP", + "trending": "WEY DEY TOP", + "reputation": "MOUTH WEY YOU GET", + "votes": "VOTE AM", + "age": "AW OLD E BE", + "top": "WEY DEY TOP", "time": "TIME" }, "transfer": { "from": "From", "to": "To", - "amount_information": "Drag the slider to adjust the amount", + "amount_information": "Move d slider so you go fit change d amount as u like", "amount": "Amount", "memo": "Memo", - "information": "Are you sure to transfer funds?", + "information": "You sure say u wan send d money?", "amount_desc": "Balance", "memo_desc": "Na everybody go see this memo", - "convert_desc": "Convert takes 3.5 days and NOT recommended IF HBD price is higher than $1", + "convert_desc": "E go take 3.5 days to change am and we no gree make u do am IF HBD cost pass $1", "to_placeholder": "Guy-name", "memo_placeholder": "Write your note for here", - "transfer_token": "Transfer", - "purchase_estm": "Purchase Points", - "convert": "Convert HBD to HIVE", + "transfer_token": "Transfer am", + "purchase_estm": "Buy dem Points", + "convert": "Change HBD enta HIVE", "points": "Gift Points to someone", "transfer_to_saving": "Transfer To Saving", "powerUp": "Power Up", From 028e4ee37eeec179ec630e4573714bfad936833f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 16 Dec 2020 06:54:46 +0200 Subject: [PATCH 038/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 48 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 2c0c704f19..64d59dd710 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -457,39 +457,39 @@ "transfer_token": "Transfer am", "purchase_estm": "Buy dem Points", "convert": "Change HBD enta HIVE", - "points": "Gift Points to someone", - "transfer_to_saving": "Transfer To Saving", + "points": "Give ur personal people dem some things", + "transfer_to_saving": "Transfer Go Saving", "powerUp": "Power Up", - "withdraw_to_saving": "Withdraw To Saving", - "steemconnect_title": "Hivesigner Transfer", - "estimated_weekly": "Estimated Weekly", - "destination_accounts": "Destination Accounts", - "stop_information": "Are you sure want to stop?", + "withdraw_to_saving": "Comot go wia you go keep am", + "steemconnect_title": "Carry am go Hivesigner", + "estimated_weekly": "Wetin we tink for every week", + "destination_accounts": "Dem accounts wey e dey go", + "stop_information": "You sure say you wan stop am?", "percent": "Percent", - "auto_vests": "Auto Vests", - "save": "SAVE", - "percent_information": "Percent info", + "auto_vests": "Vests wey computer dey do", + "save": "KEEP AM", + "percent_information": "Informate of dem Percent", "next": "NEXT", - "delegate": "Delegate", - "power_down": "Power Down", - "withdraw_steem": "Withdraw HIVE", - "withdraw_sbd": "Withdraw HIVE Dollar", - "incoming_funds": "Incoming Funds", - "stop": "Stop", - "address_view": "View address" + "delegate": "Wetin you wan dash", + "power_down": "Power am Down", + "withdraw_steem": "Comot HIVE", + "withdraw_sbd": "Comot HIVE Dollar", + "incoming_funds": "Money wey dey enta", + "stop": "Stop am", + "address_view": "Check wia e dey stay" }, "boost": { - "title": "Get Points", - "buy": "GET Points", - "next": "NEXT", + "title": "Collect dem tins", + "buy": "COLLECT dem tins", + "next": "ONTO D NEXT ONE", "account": { - "title": "Get Account Boost", - "desc": "30 days delegation will boost your votes and social activities and give you more actions with more Resource Credits." + "title": "Give Account Push", + "desc": "Wetin dem dash u for 30 days go push your votes dem and all dose flexing tinz and go give u more energy wit dem Resource Credits." } }, "free_estm": { - "title": "Free Points", - "button": "SPIN & WIN", + "title": "Collect dem Free tins", + "button": "SPIN AM MAKE U WIN", "get_spin": "DEM 5 SPINS", "spin_right": "Spin am for ur left", "timer_text": "D next spin in wey we dash" From 24435bf8d2808d7f20ad8335c84f767bf536a307 Mon Sep 17 00:00:00 2001 From: feruz Date: Wed, 16 Dec 2020 13:56:05 +0200 Subject: [PATCH 039/505] username fix --- src/components/posts/container/postsContainer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index d10a0bf14a..6ae2efe201 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -256,7 +256,7 @@ const PostsContainer = ({ console.warn('Failed to track screen', error), ); } else if (selectedFilterValue === 'feed') { - Matomo.trackView([`/${feedUsername}/${selectedFilterValue}`]).catch((error) => + Matomo.trackView([`/@${feedUsername}/${selectedFilterValue}`]).catch((error) => console.warn('Failed to track screen', error), ); } else { From a11d51b1e65c3187abeb898436668ce902cdb5f0 Mon Sep 17 00:00:00 2001 From: feruzm Date: Fri, 18 Dec 2020 15:42:41 +0200 Subject: [PATCH 040/505] version bump 3.0.12 --- android/app/build.gradle | 2 +- ios/Ecency-tvOS/Info.plist | 4 ++-- ios/Ecency-tvOSTests/Info.plist | 4 ++-- ios/Ecency.xcodeproj/project.pbxproj | 4 ++-- ios/Ecency/Info.plist | 2 +- ios/EcencyTests/Info.plist | 4 ++-- ios/Podfile.lock | 8 ++++---- ios/eshare/Info.plist | 4 ++-- package.json | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 67840c99be..68eb60f20b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -143,7 +143,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode versionMajor * 10000 + versionMinor * 100 + versionPatch - versionName "3.0.11" + versionName "3.0.12" resValue "string", "build_config_package", "app.esteem.mobile.android" multiDexEnabled true // react-native-image-crop-picker diff --git a/ios/Ecency-tvOS/Info.plist b/ios/Ecency-tvOS/Info.plist index fe4dfce457..a6007f6380 100644 --- a/ios/Ecency-tvOS/Info.plist +++ b/ios/Ecency-tvOS/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.0.11 + 3.0.12 CFBundleSignature ???? CFBundleVersion - 2561 + 2562 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/ios/Ecency-tvOSTests/Info.plist b/ios/Ecency-tvOSTests/Info.plist index ba19aa2c32..bad06b9ae0 100644 --- a/ios/Ecency-tvOSTests/Info.plist +++ b/ios/Ecency-tvOSTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.0.11 + 3.0.12 CFBundleSignature ???? CFBundleVersion - 2561 + 2562 diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj index cf1d2b846d..b2332baad8 100644 --- a/ios/Ecency.xcodeproj/project.pbxproj +++ b/ios/Ecency.xcodeproj/project.pbxproj @@ -1104,7 +1104,7 @@ CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2561; + CURRENT_PROJECT_VERSION = 2562; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 75B6RXTKGT; HEADER_SEARCH_PATHS = ( @@ -1180,7 +1180,7 @@ CODE_SIGN_ENTITLEMENTS = Ecency/Ecency.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 2561; + CURRENT_PROJECT_VERSION = 2562; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = 75B6RXTKGT; HEADER_SEARCH_PATHS = ( diff --git a/ios/Ecency/Info.plist b/ios/Ecency/Info.plist index 1b191734ae..39dc75f1d0 100644 --- a/ios/Ecency/Info.plist +++ b/ios/Ecency/Info.plist @@ -19,7 +19,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.0.11 + 3.0.12 CFBundleSignature ???? CFBundleURLTypes diff --git a/ios/EcencyTests/Info.plist b/ios/EcencyTests/Info.plist index 00f956b689..68baa5f3ff 100644 --- a/ios/EcencyTests/Info.plist +++ b/ios/EcencyTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 3.0.11 + 3.0.12 CFBundleSignature ???? CFBundleVersion - 2561 + 2562 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5eb2add02c..3502c85b0b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -401,8 +401,8 @@ PODS: - React-Core - React-RCTImage - RSKImageCropper - - RNReanimated (1.10.2): - - React + - RNReanimated (1.13.2): + - React-Core - RNScreens (2.10.1): - React - RNSVG (9.13.6): @@ -696,7 +696,7 @@ SPEC CHECKSUMS: RNGestureHandler: b6b359bb800ae399a9c8b27032bdbf7c18f08a08 RNIap: b4c77c8bc4501203f4b743126a05da23f10f40b4 RNImageCropPicker: 9d1a7eea4f8368fc479cbd2bf26459bd3c74d9aa - RNReanimated: 7de2dca51deacff78bb880f63c1389a24311b376 + RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad RNScreens: b748efec66e095134c7166ca333b628cd7e6f3e2 RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f RNVectorIcons: 368d6d8b8301224e5ffb6254191f4f8876c2be0d @@ -708,4 +708,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 1f30c7da5061dbc47185442a6ab4a3c95ac48c04 -COCOAPODS: 1.9.1 +COCOAPODS: 1.9.3 diff --git a/ios/eshare/Info.plist b/ios/eshare/Info.plist index d939105dcd..f222e5c546 100644 --- a/ios/eshare/Info.plist +++ b/ios/eshare/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType $(PRODUCT_BUNDLE_PACKAGE_TYPE) CFBundleShortVersionString - 3.0.11 + 3.0.12 CFBundleVersion - 2561 + 2562 NSExtension NSExtensionAttributes diff --git a/package.json b/package.json index e4df8e940a..e6d4c9e0fe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ecency", - "version": "3.0.11", + "version": "3.0.12", "displayName": "Ecency", "private": true, "rnpm": { From f6182bf31bcde824e83602f6b5f6e962ecff32a8 Mon Sep 17 00:00:00 2001 From: feruzm Date: Fri, 18 Dec 2020 15:50:21 +0200 Subject: [PATCH 041/505] communities filter created --- src/components/posts/container/postsContainer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index 92658f0724..1a298832da 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -178,7 +178,7 @@ const PostsContainer = ({ func = getRankedPosts; options = { observer: feedUsername, - sort: 'trending', + sort: 'created', tag: 'my', }; } else { From 75add99ee14b53581b704eaf123ced510f307028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Fri, 18 Dec 2020 23:00:23 +0300 Subject: [PATCH 042/505] Implement CommunityListTile and UserListTile. Create UserAction, UserReducer. --- .../communityListItem/communityListItem.js | 94 ++++++++++----- .../communityListItemStyles.js | 58 ++++++---- .../view/userListItem/userListItem.js | 109 ++++++++++-------- .../view/userListItem/userListItemStyles.js | 3 +- .../posts/container/postsContainer.js | 87 +++++++++++--- src/components/posts/view/postsView.js | 68 ++++++----- src/redux/actions/userAction.js | 18 +++ src/redux/constants/constants.js | 8 ++ src/redux/reducers/index.js | 2 + src/redux/reducers/userReducer.js | 82 +++++++++++++ .../searchResult/screen/communitiesList.js | 4 +- .../searchResult/screen/otherResults.js | 17 +-- 12 files changed, 391 insertions(+), 159 deletions(-) create mode 100644 src/redux/actions/userAction.js create mode 100644 src/redux/reducers/userReducer.js diff --git a/src/components/basicUIElements/view/communityListItem/communityListItem.js b/src/components/basicUIElements/view/communityListItem/communityListItem.js index cd9c21ec3d..d0e0bdcf01 100644 --- a/src/components/basicUIElements/view/communityListItem/communityListItem.js +++ b/src/components/basicUIElements/view/communityListItem/communityListItem.js @@ -1,39 +1,79 @@ -import React from 'react'; +import React, { useState } from 'react'; import { View, Text, TouchableOpacity } from 'react-native'; import { useIntl } from 'react-intl'; -import { UserAvatar } from '../../../userAvatar'; +import styles from './communityListItemStyles'; + import { Tag } from '../../index'; -import DEFAULT_IMAGE from '../../../../assets/no_image.png'; +const CommunityListItem = ({ + index, + handleOnPress, + handleOnLongPress, + title, + about, + admins, + id, + authors, + posts, + subscribers, + isNsfw, + name, + handleSubscribeButtonPress, + isSubscribed, + isLoggedIn, +}) => { + const [subscribed, setSubscribed] = useState(isSubscribed); + const intl = useIntl(); -import styles from './communityListItemStyles'; + const _handleSubscribeButtonPress = () => { + handleSubscribeButtonPress({ subscribed: !subscribed, communityId: name }).then(() => { + setSubscribed(!subscribed); + }); + }; -const CommunityListItem = ({ item, index, handleOnPress, handleSubscribeButtonPress }) => { - const intl = useIntl(); return ( - - - handleOnPress(item[0])}> - - - handleOnPress(item[0])}> - {item[1]} - - - - handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] })} - /> + handleOnLongPress && handleOnLongPress()} + onPress={() => handleOnPress && handleOnPress(name)} + > + + + + {title} + {isLoggedIn && ( + + )} + + {!!about && {about}} + + + {`${subscribers.toString()} ${intl.formatMessage({ + id: 'search_result.communities.subscribers', + })} • ${authors.toString()} ${intl.formatMessage({ + id: 'search_result.communities.posters', + })} • ${posts} ${intl.formatMessage({ + id: 'search_result.communities.posts', + })}`} + + - + ); }; diff --git a/src/components/basicUIElements/view/communityListItem/communityListItemStyles.js b/src/components/basicUIElements/view/communityListItem/communityListItemStyles.js index 6fe3db6757..19880705c4 100644 --- a/src/components/basicUIElements/view/communityListItem/communityListItemStyles.js +++ b/src/components/basicUIElements/view/communityListItem/communityListItemStyles.js @@ -2,47 +2,61 @@ import EStyleSheet from 'react-native-extended-stylesheet'; export default EStyleSheet.create({ container: { - flex: 1, - backgroundColor: '$primaryBackgroundColor', + padding: 8, + flexDirection: 'row', + }, + content: { + flexDirection: 'column', + marginLeft: 8, + width: '100%', }, itemWrapper: { - paddingHorizontal: 16, - paddingTop: 16, - paddingBottom: 8, + alignItems: 'center', + padding: 16, borderRadius: 8, - backgroundColor: '$primaryBackgroundColor', flexDirection: 'row', - alignItems: 'center', + backgroundColor: '$primaryBackgroundColor', }, itemWrapperGray: { backgroundColor: '$primaryLightBackground', }, - username: { - marginLeft: 10, + title: { + color: '$primaryBlue', + fontSize: 17, + fontWeight: 'bold', + fontFamily: '$primaryFont', + }, + about: { + fontSize: 14, + fontFamily: '$primaryFont', + marginTop: 5, + paddingTop: 10, color: '$primaryBlack', }, - communityWrapper: { - paddingHorizontal: 16, - paddingTop: 10, + separator: { + width: 100, + alignSelf: 'center', + backgroundColor: '$primaryDarkGray', + height: 1, + marginVertical: 10, + }, + stats: { + fontSize: 14, + fontFamily: '$primaryFont', + color: '$primaryDarkGray', paddingBottom: 10, - borderRadius: 8, - backgroundColor: '$primaryBackgroundColor', - flexDirection: 'row', - alignItems: 'center', - flex: 1, }, subscribeButton: { - maxWidth: 75, borderWidth: 1, + maxWidth: 75, borderColor: '$primaryBlue', }, subscribeButtonText: { textAlign: 'center', color: '$primaryBlue', }, - community: { - justifyContent: 'center', - marginLeft: 15, - color: '$primaryBlack', + header: { + flexDirection: 'row', + justifyContent: 'space-between', }, }); diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index 194df1644c..5bfce61786 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -1,4 +1,4 @@ -import React from 'react'; +import React, { useState } from 'react'; import { View, Text, TouchableOpacity } from 'react-native'; import { UserAvatar } from '../../../userAvatar'; import styles from './userListItemStyles'; @@ -13,58 +13,73 @@ const UserListItem = ({ isHasRightItem, isBlackRightColor, itemIndex, - userCanPress, + userCanPress = false, handleOnPress, handleOnLongPress, - isClickable, + isClickable = true, text, middleText, rightTextStyle, onPressRightText, -}) => ( - handleOnLongPress && handleOnLongPress()} - disabled={!isClickable} - onPress={() => handleOnPress && handleOnPress()} - > - - {itemIndex && {itemIndex}} - - - {text || username} - {description && {description}} - - {middleText && ( - - - {middleText} - - - )} - {isHasRightItem && ( - - - {rightText} - - {subRightText && {subRightText}} + isFollowing, + handleFollowUserButtonPress, +}) => { + const [following, setFollowing] = useState(isFollowing); + + const _handleSubscribeButtonPress = () => { + const _data = {}; + _data.following = username; + + handleFollowUserButtonPress({ _data, isFollowing }).then(() => { + setFollowing(!following); + }); + }; + + return ( + handleOnLongPress && handleOnLongPress()} + disabled={!isClickable} + onPress={() => handleOnPress && handleOnPress()} + > + + {itemIndex && {itemIndex}} + + + {text || username} + {description && {description}} - )} - - -); + {middleText && ( + + + {middleText} + + + )} + {isHasRightItem && ( + + + {rightText} + + {subRightText && {subRightText}} + + )} + + + ); +}; export default UserListItem; diff --git a/src/components/basicUIElements/view/userListItem/userListItemStyles.js b/src/components/basicUIElements/view/userListItem/userListItemStyles.js index e72cf5859b..cee6c8b5b5 100644 --- a/src/components/basicUIElements/view/userListItem/userListItemStyles.js +++ b/src/components/basicUIElements/view/userListItem/userListItemStyles.js @@ -13,7 +13,8 @@ export default EStyleSheet.create({ }, voteItemWrapper: { alignItems: 'center', - padding: 16, + paddingHorizontal: 16, + paddingVertical: 12, borderRadius: 8, flexDirection: 'row', backgroundColor: '$primaryBackgroundColor', diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index 3ae0471d7e..3087fd8d4b 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -3,10 +3,18 @@ import { useDispatch, useSelector } from 'react-redux'; import get from 'lodash/get'; import unionBy from 'lodash/unionBy'; import Matomo from 'react-native-matomo-sdk'; +import { useIntl } from 'react-intl'; // HIVE -import { getAccountPosts, getPost, getRankedPosts } from '../../../providers/hive/dhive'; -import { getCommunities } from '../../../providers/hive/hive'; +import { + followUser, + unfollowUser, + getAccountPosts, + getPost, + getRankedPosts, + subscribeCommunity, +} from '../../../providers/hive/dhive'; +import { getCommunities, getCommunity } from '../../../providers/hive/hive'; import { getPromotePosts, getLeaderboard } from '../../../providers/ecency/ecency'; // Component @@ -14,7 +22,7 @@ import PostsView from '../view/postsView'; // Actions import { setFeedPosts } from '../../../redux/actions/postsAction'; -import { hidePostsThumbnails } from '../../../redux/actions/uiAction'; +import { hidePostsThumbnails, toastNotification } from '../../../redux/actions/uiAction'; import useIsMountedRef from '../../../customHooks/useIsMountedRef'; @@ -33,6 +41,7 @@ const PostsContainer = ({ feedSubfilterOptionsValue, }) => { const dispatch = useDispatch(); + const intl = useIntl(); const nsfw = useSelector((state) => state.application.nsfw); const feedPosts = useSelector((state) => state.posts.feedPosts); @@ -41,6 +50,8 @@ const PostsContainer = ({ const username = useSelector((state) => state.account.currentAccount.name); const isLoggedIn = useSelector((state) => state.application.isLoggedIn); const isAnalytics = useSelector((state) => state.application.isAnalytics); + const currentAccount = useSelector((state) => state.account.currentAccount); + const pinCode = useSelector((state) => state.application.pin); const [isNoPost, setIsNoPost] = useState(false); const [startPermlink, setStartPermlink] = useState(''); @@ -291,27 +302,63 @@ const PostsContainer = ({ setIsNoPost(false); }; - const _getRecommendedUsers = () => { - getLeaderboard() - .then((users) => { - const recommendeds = users.slice(0, 10); - recommendeds.unshift({ _id: 'good-karma' }); - recommendeds.unshift({ _id: 'ecency' }); + const _getRecommendedUsers = async () => { + try { + const users = await getLeaderboard(); + const recommendeds = users.slice(0, 10); + recommendeds.unshift({ _id: 'good-karma' }); + recommendeds.unshift({ _id: 'ecency' }); - setRecommendedUsers(recommendeds); - }) - .catch((err) => console.log(err, '_getRecommendedUsers Error')); + setRecommendedUsers(recommendeds); + } catch (err) { + console.log(err, '_getRecommendedUsers Error'); + } + }; + + const _getRecommendedCommunities = async () => { + try { + const communities = await getCommunities('', 10); + const ecency = await getCommunity('hive-125125'); + + const recommendeds = [ecency, ...communities]; + recommendeds.forEach((item) => ({ ...item, isFollowing: false })); + + setRecommendedCommunities(recommendeds); + } catch (err) { + console.log(err, '_getRecommendedUsers Error'); + } }; - const _getRecommendedCommunities = () => { - getCommunities('', 10) - .then((communities) => { - const recommendeds = [...communities]; - recommendeds.unshift({ title: 'Ecency', name: 'hive-125125' }); + const _handleFollowUserButtonPress = (_data, isFollowing) => { + let followAction; + + if (!isFollowing) { + followAction = followUser; + } else { + followAction = unfollowUser; + } + + _data.follower = get(currentAccount, 'name', ''); + + followAction(currentAccount, pinCode, _data) + .then(() => { + dispatch( + toastNotification( + intl.formatMessage({ + id: isFollowing ? 'alert.success_unfollow' : 'alert.success_follow', + }), + ), + ); - setRecommendedCommunities(recommendeds); + //changeIsFollowingField(); }) - .catch((err) => console.log(err, '_getRecommendedUsers Error')); + .catch((err) => { + console.log(err, '_handleFollowUserButtonPress Error'); + }); + }; + + const _handleSubscribeCommunityButtonPress = (_data) => { + return subscribeCommunity(currentAccount, pinCode, _data); }; return ( @@ -347,6 +394,8 @@ const PostsContainer = ({ getRecommendedCommunities={_getRecommendedCommunities} recommendedUsers={recommendedUsers} recommendedCommunities={recommendedCommunities} + handleFollowUserButtonPress={_handleFollowUserButtonPress} + handleSubscribeCommunityButtonPress={_handleSubscribeCommunityButtonPress} /> ); }; diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index f716a74ec5..5f692fab87 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -8,7 +8,12 @@ import { get } from 'lodash'; // COMPONENTS import { PostCard } from '../../postCard'; import { FilterBar } from '../../filterBar'; -import { PostCardPlaceHolder, NoPost, UserListItem } from '../../basicUIElements'; +import { + PostCardPlaceHolder, + NoPost, + UserListItem, + CommunityListItem, +} from '../../basicUIElements'; import { ThemeContainer } from '../../../containers'; // Styles @@ -49,6 +54,8 @@ const PostsView = ({ getRecommendedCommunities, recommendedUsers, recommendedCommunities, + handleFollowUserButtonPress, + handleSubscribeCommunityButtonPress, }) => { const intl = useIntl(); const postsList = useRef(null); @@ -58,9 +65,13 @@ const PostsView = ({ if (isNoPost) { if (selectedFilterValue === 'feed') { if (selectedFeedSubfilterValue === 'friends') { - getRecommendedUsers(); + if (recommendedUsers.length === 0) { + getRecommendedUsers(); + } } else { - getRecommendedCommunities(); + if (recommendedCommunities.length === 0) { + getRecommendedCommunities(); + } } } } @@ -123,6 +134,7 @@ const PostsView = ({ if (isNoPost) { if (selectedFilterValue === 'feed') { if (selectedFeedSubfilterValue === 'friends') { + console.log(recommendedUsers, 'recommendedUsers'); return ( <> @@ -136,16 +148,14 @@ const PostsView = ({ username={item._id} isHasRightItem rightText="follow" - onPressRightText={() => { - console.log('users pressed'); - }} + isFollowing={false} + onPressRightText={handleFollowUserButtonPress} /> )} /> ); } else { - console.log(recommendedCommunities, 'recommendedCommunities'); return ( <> @@ -154,15 +164,28 @@ const PostsView = ({ ( - { - console.log('users pressed'); - }} + title={item.title} + about={item.about} + admins={item.admins} + id={item.id} + authors={item.num_authors} + posts={item.num_pending} + subscribers={item.subscribers} + isNsfw={item.is_nsfw} + name={item.name} + handleOnPress={(name) => + navigation.navigate({ + routeName: ROUTES.SCREENS.COMMUNITY, + params: { + tag: name, + }, + }) + } + handleSubscribeButtonPress={handleSubscribeCommunityButtonPress} + isSubscribed={false} + isLoggedIn={isLoggedIn} /> )} /> @@ -172,21 +195,6 @@ const PostsView = ({ } else { return {intl.formatMessage({ id: 'profile.havent_posted' })}; } - // } return ( diff --git a/src/redux/actions/userAction.js b/src/redux/actions/userAction.js new file mode 100644 index 0000000000..3ac65a9249 --- /dev/null +++ b/src/redux/actions/userAction.js @@ -0,0 +1,18 @@ +import { + FOLLOW_USER, + FOLLOW_USER_SUCCESS, + FOLLOW_USER_FAIL, + UNFOLLOW_USER, + UNFOLLOW_USER_SUCCESS, + UNFOLLOW_USER_FAIL, +} from '../constants/constants'; + +export const followUser = (payload) => ({ + payload, + type: FOLLOW_USER, +}); + +export const unfollowUser = (payload) => ({ + payload, + type: UNFOLLOW_USER, +}); diff --git a/src/redux/constants/constants.js b/src/redux/constants/constants.js index 8313e0fb23..305713c971 100644 --- a/src/redux/constants/constants.js +++ b/src/redux/constants/constants.js @@ -66,3 +66,11 @@ export const FETCH_COMMUNITIES_FAIL = 'FETCH_COMMUNITIES_FAIL'; export const FETCH_SUBSCRIBED_COMMUNITIES = 'FETCH_SUBSCRIBED_COMMUNITIES'; export const FETCH_SUBSCRIBED_COMMUNITIES_SUCCESS = 'FETCH_SUBSCRIBED_COMMUNITIES_SUCCESS'; export const FETCH_SUBSCRIBED_COMMUNITIES_FAIL = 'FETCH_SUBSCRIBED_COMMUNITIES_FAIL'; + +// USER +export const FOLLOW_USER = 'FOLLOW_USER'; +export const FOLLOW_USER_SUCCESS = 'FOLLOW_USER_SUCCESS'; +export const FOLLOW_USER_FAIL = 'FOLLOW_USER_FAIL'; +export const UNFOLLOW_USER = 'UNFOLLOW_USER'; +export const UNFOLLOW_USER_SUCCESS = 'UNFOLLOW_USER_SUCCESS'; +export const UNFOLLOW_USER_FAIL = 'UNFOLLOW_USER_FAIL'; diff --git a/src/redux/reducers/index.js b/src/redux/reducers/index.js index 1e2ff77fb8..cd6b440d6c 100644 --- a/src/redux/reducers/index.js +++ b/src/redux/reducers/index.js @@ -5,6 +5,7 @@ import nav from './nav'; import ui from './uiReducer'; import postsReducer from './postsReducer'; import communities from './communitiesReducer'; +import user from './userReducer'; export default combineReducers({ account: accountReducer, @@ -13,4 +14,5 @@ export default combineReducers({ nav, ui, communities, + user, }); diff --git a/src/redux/reducers/userReducer.js b/src/redux/reducers/userReducer.js new file mode 100644 index 0000000000..9a35643d50 --- /dev/null +++ b/src/redux/reducers/userReducer.js @@ -0,0 +1,82 @@ +import { + FOLLOW_USER, + FOLLOW_USER_SUCCESS, + FOLLOW_USER_FAIL, + UNFOLLOW_USER, + UNFOLLOW_USER_SUCCESS, + UNFOLLOW_USER_FAIL, +} from '../constants/constants'; + +const initialState = { + followUser: { + data: {}, + loading: false, + error: false, + }, + unfollowUser: { + data: {}, + loading: false, + error: false, + }, +}; + +export default function (state = initialState, action) { + switch (action.type) { + case FOLLOW_USER: + return { + ...state, + followUser: { + data: {}, + loading: true, + error: false, + }, + }; + case FOLLOW_USER_SUCCESS: + return { + ...state, + followUser: { + data: action.payload, + loading: false, + error: false, + }, + }; + case FOLLOW_USER_FAIL: + return { + ...state, + followUser: { + data: {}, + loading: false, + error: action.payload, + }, + }; + case UNFOLLOW_USER: + return { + ...state, + unfollowUser: { + data: {}, + loading: true, + error: false, + }, + }; + case UNFOLLOW_USER_SUCCESS: + return { + ...state, + unfollowUser: { + data: action.payload, + loading: false, + error: false, + }, + }; + case UNFOLLOW_USER_FAIL: + return { + ...state, + unfollowUser: { + data: {}, + loading: false, + error: action.payload, + }, + }; + default: + return state; + } +} diff --git a/src/screens/searchResult/screen/communitiesList.js b/src/screens/searchResult/screen/communitiesList.js index a581b768e2..c6be73ddfd 100644 --- a/src/screens/searchResult/screen/communitiesList.js +++ b/src/screens/searchResult/screen/communitiesList.js @@ -2,7 +2,7 @@ import React from 'react'; import { SafeAreaView, FlatList } from 'react-native'; // Components -import CommunitiesListItem from './CommunitiesListItem'; +import { CommunityListItem } from '../../../components/basicUIElements'; import { CommunitiesPlaceHolder } from '../../../components/basicUIElements'; // Styles @@ -20,7 +20,7 @@ const CommunitiesList = ({ const isSubscribed = allSubscriptions.some((sub) => sub[0] === item.name); return ( - { const intl = useIntl(); - const _renderUserItem = (item, index) => ( - - - {item} - - ); - const _renderTagItem = (item, index) => ( {`#${item.name}`} @@ -52,9 +45,11 @@ const OtherResult = ({ navigation, searchValue }) => { data={users} keyExtractor={(item, ind) => `${item}-${ind}`} renderItem={({ item, index }) => ( - handleOnPress(item)}> - {_renderUserItem(item, index)} - + handleOnPress(item)} + index={index} + username={item} + /> )} ListEmptyComponent={_renderEmptyContent} /> From 7ad098a61346dcd8b058505a89ac057f4e836b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Fri, 18 Dec 2020 23:58:21 +0300 Subject: [PATCH 043/505] Start to you redux for requests --- ios/Podfile.lock | 8 +-- .../view/userListItem/userListItem.js | 10 +--- .../posts/container/postsContainer.js | 35 +++++------ src/redux/actions/userAction.js | 60 +++++++++++++++++-- src/redux/reducers/userReducer.js | 1 + 5 files changed, 81 insertions(+), 33 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 5eb2add02c..e58eed3672 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -401,8 +401,8 @@ PODS: - React-Core - React-RCTImage - RSKImageCropper - - RNReanimated (1.10.2): - - React + - RNReanimated (1.13.2): + - React-Core - RNScreens (2.10.1): - React - RNSVG (9.13.6): @@ -696,7 +696,7 @@ SPEC CHECKSUMS: RNGestureHandler: b6b359bb800ae399a9c8b27032bdbf7c18f08a08 RNIap: b4c77c8bc4501203f4b743126a05da23f10f40b4 RNImageCropPicker: 9d1a7eea4f8368fc479cbd2bf26459bd3c74d9aa - RNReanimated: 7de2dca51deacff78bb880f63c1389a24311b376 + RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad RNScreens: b748efec66e095134c7166ca333b628cd7e6f3e2 RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f RNVectorIcons: 368d6d8b8301224e5ffb6254191f4f8876c2be0d @@ -708,4 +708,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 1f30c7da5061dbc47185442a6ab4a3c95ac48c04 -COCOAPODS: 1.9.1 +COCOAPODS: 1.10.0 diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index 5bfce61786..968bc97199 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React from 'react'; import { View, Text, TouchableOpacity } from 'react-native'; import { UserAvatar } from '../../../userAvatar'; import styles from './userListItemStyles'; @@ -22,17 +22,12 @@ const UserListItem = ({ rightTextStyle, onPressRightText, isFollowing, - handleFollowUserButtonPress, }) => { - const [following, setFollowing] = useState(isFollowing); - const _handleSubscribeButtonPress = () => { const _data = {}; _data.following = username; - handleFollowUserButtonPress({ _data, isFollowing }).then(() => { - setFollowing(!following); - }); + onPressRightText(_data, isFollowing); }; return ( @@ -70,7 +65,6 @@ const UserListItem = ({ isBlackRightColor && styles.valueBlack, rightTextStyle, ]} - onPress={onPressRightText} > {rightText} diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index 3087fd8d4b..4816d44b31 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -7,8 +7,6 @@ import { useIntl } from 'react-intl'; // HIVE import { - followUser, - unfollowUser, getAccountPosts, getPost, getRankedPosts, @@ -23,6 +21,7 @@ import PostsView from '../view/postsView'; // Actions import { setFeedPosts } from '../../../redux/actions/postsAction'; import { hidePostsThumbnails, toastNotification } from '../../../redux/actions/uiAction'; +import { followUser, unfollowUser } from '../../../redux/actions/userAction'; import useIsMountedRef from '../../../customHooks/useIsMountedRef'; @@ -340,21 +339,23 @@ const PostsContainer = ({ _data.follower = get(currentAccount, 'name', ''); - followAction(currentAccount, pinCode, _data) - .then(() => { - dispatch( - toastNotification( - intl.formatMessage({ - id: isFollowing ? 'alert.success_unfollow' : 'alert.success_follow', - }), - ), - ); - - //changeIsFollowingField(); - }) - .catch((err) => { - console.log(err, '_handleFollowUserButtonPress Error'); - }); + console.log(_data, isFollowing, '_handleFollowUserButtonPress'); + + dispatch(followAction(currentAccount, pinCode, _data)); + // .then(() => { + // dispatch( + // toastNotification( + // intl.formatMessage({ + // id: isFollowing ? 'alert.success_unfollow' : 'alert.success_follow', + // }), + // ), + // ); + + // //changeIsFollowingField(); + // }) + // .catch((err) => { + // console.log(err, '_handleFollowUserButtonPress Error'); + // }); }; const _handleSubscribeCommunityButtonPress = (_data) => { diff --git a/src/redux/actions/userAction.js b/src/redux/actions/userAction.js index 3ac65a9249..2a19606fe8 100644 --- a/src/redux/actions/userAction.js +++ b/src/redux/actions/userAction.js @@ -5,14 +5,66 @@ import { UNFOLLOW_USER, UNFOLLOW_USER_SUCCESS, UNFOLLOW_USER_FAIL, + TOAST_NOTIFICATION, } from '../constants/constants'; -export const followUser = (payload) => ({ +import { followUser as followUserReq } from '../../providers/hive/dhive'; + +export const followUser = (currentAccount, pin, data) => { + return (dispatch) => { + dispatch({ + type: FOLLOW_USER, + }); + console.log('followUser', currentAccount, pin, data); + followUserReq(currentAccount, pin, data) + .then((res) => + dispatch({ + payload: res, + type: FOLLOW_USER_SUCCESS, + }), + ) + .catch((err) => + dispatch({ + payload: err, + type: FOLLOW_USER_FAIL, + }), + ); + }; +}; + +export const followUserSuccess = (payload) => { + return (dispatch) => { + // dispatch({ + // payload, + // type: FOLLOW_USER_SUCCESS, + // }); + // dispatch({ + // payload: 'done', + // type: TOAST_NOTIFICATION, + // }); + // toastNotification( + // intl.formatMessage({ + // //id: isFollowing ? 'alert.success_unfollow' : 'alert.success_follow', + // }), + // ), + }; +}; + +export const followUserFail = (payload) => ({ payload, - type: FOLLOW_USER, + type: FOLLOW_USER_FAIL, }); -export const unfollowUser = (payload) => ({ - payload, +export const unfollowUser = ({ currentAccount, pin, data }) => ({ type: UNFOLLOW_USER, }); + +export const unfollowUserSuccess = (payload) => ({ + payload, + type: UNFOLLOW_USER_SUCCESS, +}); + +export const funollowUserFail = (payload) => ({ + payload, + type: UNFOLLOW_USER_FAIL, +}); diff --git a/src/redux/reducers/userReducer.js b/src/redux/reducers/userReducer.js index 9a35643d50..0dda9b4085 100644 --- a/src/redux/reducers/userReducer.js +++ b/src/redux/reducers/userReducer.js @@ -21,6 +21,7 @@ const initialState = { }; export default function (state = initialState, action) { + console.log(action.type, action.payload); switch (action.type) { case FOLLOW_USER: return { From 282a9ebcadaa1f88e14adfcd34aa3899ac49561a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sat, 19 Dec 2020 17:04:08 +0300 Subject: [PATCH 044/505] UserActions and CommunityActions rewrite --- .../view/userListItem/userListItem.js | 44 ++++--- .../selectCommunityModalContainer.js | 21 +--- .../posts/container/postsContainer.js | 115 +++++++++++------ src/components/posts/view/postsView.js | 23 +++- src/config/locales/en-US.json | 6 + src/redux/actions/communitiesAction.js | 27 ++-- src/redux/actions/userAction.js | 118 +++++++++++------- src/redux/constants/constants.js | 3 + src/redux/reducers/userReducer.js | 36 +++++- src/redux/store/store.js | 2 +- 10 files changed, 265 insertions(+), 130 deletions(-) diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index 968bc97199..079b4bfdb6 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -1,5 +1,6 @@ import React from 'react'; -import { View, Text, TouchableOpacity } from 'react-native'; +import { ActivityIndicator, View, Text, TouchableOpacity } from 'react-native'; + import { UserAvatar } from '../../../userAvatar'; import styles from './userListItemStyles'; @@ -13,7 +14,6 @@ const UserListItem = ({ isHasRightItem, isBlackRightColor, itemIndex, - userCanPress = false, handleOnPress, handleOnLongPress, isClickable = true, @@ -21,7 +21,8 @@ const UserListItem = ({ middleText, rightTextStyle, onPressRightText, - isFollowing, + isFollowing = false, + isLoadingRightAction = false, }) => { const _handleSubscribeButtonPress = () => { const _data = {}; @@ -34,11 +35,11 @@ const UserListItem = ({ handleOnLongPress && handleOnLongPress()} disabled={!isClickable} - onPress={() => handleOnPress && handleOnPress()} + onPress={() => handleOnPress && handleOnPress(username)} > {itemIndex && {itemIndex}} - + {text || username} {description && {description}} @@ -56,21 +57,24 @@ const UserListItem = ({ )} - {isHasRightItem && ( - - - {rightText} - - {subRightText && {subRightText}} - - )} + {isHasRightItem && + (isLoadingRightAction ? ( + + ) : ( + + + {rightText} + + {subRightText && {subRightText}} + + ))} ); diff --git a/src/components/editorElements/selectCommunityModal/container/selectCommunityModalContainer.js b/src/components/editorElements/selectCommunityModal/container/selectCommunityModalContainer.js index 31887dbbd3..9d813851a2 100644 --- a/src/components/editorElements/selectCommunityModal/container/selectCommunityModalContainer.js +++ b/src/components/editorElements/selectCommunityModal/container/selectCommunityModalContainer.js @@ -29,26 +29,9 @@ const SelectCommunityModalContainer = ({ onPressCommunity, currentAccount }) => callSubscribedCommunities(); }, []); - const callTopCommunities = () => { - dispatch(fetchCommunities()); + const callTopCommunities = () => dispatch(fetchCommunities('', 15, '', 'rank')); - getCommunities('', 15, '', 'rank') - .then((communities) => { - dispatch(fetchCommunitiesSuccess(communities)); - }) - .catch((error) => { - console.log(error); - }); - }; - - const callSubscribedCommunities = () => { - dispatch(fetchSubscribedCommunities()); - getSubscriptions(currentAccount.name) - .then((subscriptions) => { - dispatch(fetchSubscribedCommunitiesSuccess(subscriptions)); - }) - .catch((error) => console.log(error)); - }; + const callSubscribedCommunities = () => dispatch(fetchSubscribedCommunities(currentAccount.name)); const handleChangeSearch = (text) => { if (text.length >= 3) { diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index 4816d44b31..68b848a837 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -1,6 +1,6 @@ import React, { useState, useEffect, useRef } from 'react'; import { useDispatch, useSelector } from 'react-redux'; -import get from 'lodash/get'; +import { get, isEmpty } from 'lodash'; import unionBy from 'lodash/unionBy'; import Matomo from 'react-native-matomo-sdk'; import { useIntl } from 'react-intl'; @@ -11,19 +11,20 @@ import { getPost, getRankedPosts, subscribeCommunity, + getCommunity, } from '../../../providers/hive/dhive'; -import { getCommunities, getCommunity } from '../../../providers/hive/hive'; -import { getPromotePosts, getLeaderboard } from '../../../providers/ecency/ecency'; +import { getPromotePosts } from '../../../providers/ecency/ecency'; // Component import PostsView from '../view/postsView'; // Actions import { setFeedPosts } from '../../../redux/actions/postsAction'; -import { hidePostsThumbnails, toastNotification } from '../../../redux/actions/uiAction'; -import { followUser, unfollowUser } from '../../../redux/actions/userAction'; +import { hidePostsThumbnails } from '../../../redux/actions/uiAction'; +import { fetchLeaderboard, followUser, unfollowUser } from '../../../redux/actions/userAction'; import useIsMountedRef from '../../../customHooks/useIsMountedRef'; +import { fetchCommunities } from '../../../redux/actions/communitiesAction'; const PostsContainer = ({ changeForceLoadPostState, @@ -51,6 +52,10 @@ const PostsContainer = ({ const isAnalytics = useSelector((state) => state.application.isAnalytics); const currentAccount = useSelector((state) => state.account.currentAccount); const pinCode = useSelector((state) => state.application.pin); + const leaderboard = useSelector((state) => state.user.leaderboard); + const communities = useSelector((state) => state.communities.communities); + const lastFollowedUser = useSelector((state) => state.user.followUser); + const lastUnfollowedUser = useSelector((state) => state.user.unfollowUser); const [isNoPost, setIsNoPost] = useState(false); const [startPermlink, setStartPermlink] = useState(''); @@ -69,6 +74,8 @@ const PostsContainer = ({ ); const [recommendedUsers, setRecommendedUsers] = useState([]); const [recommendedCommunities, setRecommendedCommunities] = useState([]); + const [followedUsers, setFollowedUsers] = useState([]); + const [subscribedCommunities, setSubscribedCommunities] = useState([]); const elem = useRef(null); const isMountedRef = useIsMountedRef(); @@ -126,6 +133,39 @@ const PostsContainer = ({ } }, [refreshing]); + useEffect(() => { + if (!leaderboard.loading) { + if (!leaderboard.error && leaderboard.data.length > 0) { + _formatRecommendedUsers(leaderboard.data); + } + } + }, [leaderboard]); + + useEffect(() => { + if (!communities.loading) { + if (!communities.error && communities.data.length > 0) { + _formatRecommendedCommunities(communities.data); + } + } + }, [communities]); + + useEffect(() => { + if (!lastFollowedUser.loading) { + if (!lastFollowedUser.error && !isEmpty(lastFollowedUser.data)) { + const recommendeds = [...recommendedUsers]; + recommendeds.forEach((item) => { + if (item._id === lastFollowedUser.data.following) { + item.isFollowing = true; + } + }); + + setRecommendedUsers(recommendeds); + } + } + }, [lastFollowedUser]); + + useEffect(() => {}, [lastUnfollowedUser]); + const _setFeedPosts = (_posts) => { dispatch(setFeedPosts(_posts)); }; @@ -301,26 +341,27 @@ const PostsContainer = ({ setIsNoPost(false); }; - const _getRecommendedUsers = async () => { - try { - const users = await getLeaderboard(); - const recommendeds = users.slice(0, 10); - recommendeds.unshift({ _id: 'good-karma' }); - recommendeds.unshift({ _id: 'ecency' }); + const _getRecommendedUsers = () => dispatch(fetchLeaderboard()); - setRecommendedUsers(recommendeds); - } catch (err) { - console.log(err, '_getRecommendedUsers Error'); - } + const _formatRecommendedUsers = (usersArray) => { + const recommendeds = usersArray.slice(0, 10); + + recommendeds.unshift({ _id: 'good-karma' }); + recommendeds.unshift({ _id: 'ecency' }); + + recommendeds.forEach((item) => ({ ...item, isFollowing: false })); + + setRecommendedUsers(recommendeds); }; - const _getRecommendedCommunities = async () => { + const _getRecommendedCommunities = () => dispatch(fetchCommunities('', 10)); + + const _formatRecommendedCommunities = async (communitiesArray) => { try { - const communities = await getCommunities('', 10); const ecency = await getCommunity('hive-125125'); - const recommendeds = [ecency, ...communities]; - recommendeds.forEach((item) => ({ ...item, isFollowing: false })); + const recommendeds = [ecency, ...communitiesArray]; + recommendeds.forEach((item) => ({ ...item, isJoined: false })); setRecommendedCommunities(recommendeds); } catch (err) { @@ -330,32 +371,32 @@ const PostsContainer = ({ const _handleFollowUserButtonPress = (_data, isFollowing) => { let followAction; + let successToastText = ''; + let failToastText = ''; if (!isFollowing) { followAction = followUser; + + successToastText = intl.formatMessage({ + id: 'alert.success_follow', + }); + failToastText = intl.formatMessage({ + id: 'alert.fail_follow', + }); } else { followAction = unfollowUser; + + successToastText = intl.formatMessage({ + id: 'alert.success_unfollow', + }); + failToastText = intl.formatMessage({ + id: 'alert.fail_unfollow', + }); } _data.follower = get(currentAccount, 'name', ''); - console.log(_data, isFollowing, '_handleFollowUserButtonPress'); - - dispatch(followAction(currentAccount, pinCode, _data)); - // .then(() => { - // dispatch( - // toastNotification( - // intl.formatMessage({ - // id: isFollowing ? 'alert.success_unfollow' : 'alert.success_follow', - // }), - // ), - // ); - - // //changeIsFollowingField(); - // }) - // .catch((err) => { - // console.log(err, '_handleFollowUserButtonPress Error'); - // }); + dispatch(followAction(currentAccount, pinCode, _data, successToastText, failToastText)); }; const _handleSubscribeCommunityButtonPress = (_data) => { @@ -397,6 +438,8 @@ const PostsContainer = ({ recommendedCommunities={recommendedCommunities} handleFollowUserButtonPress={_handleFollowUserButtonPress} handleSubscribeCommunityButtonPress={_handleSubscribeCommunityButtonPress} + lastFollowedUser={lastFollowedUser} + lastUnfollowedUser={lastUnfollowedUser} /> ); }; diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index 5f692fab87..593c3eb5ab 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -56,6 +56,8 @@ const PostsView = ({ recommendedCommunities, handleFollowUserButtonPress, handleSubscribeCommunityButtonPress, + lastFollowedUser, + isUnfollowLoading, }) => { const intl = useIntl(); const postsList = useRef(null); @@ -134,7 +136,7 @@ const PostsView = ({ if (isNoPost) { if (selectedFilterValue === 'feed') { if (selectedFeedSubfilterValue === 'friends') { - console.log(recommendedUsers, 'recommendedUsers'); + console.log('lastFollowedUser', lastFollowedUser); return ( <> @@ -147,9 +149,24 @@ const PostsView = ({ index={index} username={item._id} isHasRightItem - rightText="follow" - isFollowing={false} + rightText={ + item.isFollowing + ? intl.formatMessage({ id: 'user.unfollow' }) + : intl.formatMessage({ id: 'user.follow' }) + } + isRightColor={item.isFollowing} + isFollowing={item.isFollowing} + isLoadingRightAction={lastFollowedUser.loading} onPressRightText={handleFollowUserButtonPress} + handleOnPress={(username) => + navigation.navigate({ + routeName: ROUTES.SCREENS.PROFILE, + params: { + username, + }, + key: username, + }) + } /> )} /> diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 2c0413f07f..7e15a7eddf 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -320,9 +320,11 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid PIN code, please check and try again.", "remove_alert": "Are you sure you want to remove?", @@ -556,5 +558,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } diff --git a/src/redux/actions/communitiesAction.js b/src/redux/actions/communitiesAction.js index fc5c38def6..33c82abe56 100644 --- a/src/redux/actions/communitiesAction.js +++ b/src/redux/actions/communitiesAction.js @@ -7,10 +7,16 @@ import { FETCH_SUBSCRIBED_COMMUNITIES_FAIL, } from '../constants/constants'; -export const fetchCommunities = (payload) => ({ - payload, - type: FETCH_COMMUNITIES, -}); +import { getCommunities, getSubscriptions } from '../../providers/hive/hive'; + +export const fetchCommunities = (last, limit, query, sort, observer) => { + return (dispatch) => { + dispatch({ type: FETCH_COMMUNITIES }); + getCommunities(last, limit, query, sort, observer) + .then((res) => dispatch(fetchCommunitiesSuccess(res))) + .catch((err) => dispatch(fetchCommunitiesFail(err))); + }; +}; export const fetchCommunitiesSuccess = (payload) => ({ payload, type: FETCH_COMMUNITIES_SUCCESS, @@ -19,10 +25,15 @@ export const fetchCommunitiesFail = (payload) => ({ payload, type: FETCH_COMMUNITIES_FAIL, }); -export const fetchSubscribedCommunities = (payload) => ({ - payload, - type: FETCH_SUBSCRIBED_COMMUNITIES, -}); + +export const fetchSubscribedCommunities = (username) => { + return (dispatch) => { + dispatch({ type: FETCH_SUBSCRIBED_COMMUNITIES }); + getSubscriptions(username) + .then((res) => dispatch(fetchSubscribedCommunitiesSuccess(res))) + .catch((err) => dispatch(fetchSubscribedCommunitiesFail(err))); + }; +}; export const fetchSubscribedCommunitiesSuccess = (payload) => ({ payload, type: FETCH_SUBSCRIBED_COMMUNITIES_SUCCESS, diff --git a/src/redux/actions/userAction.js b/src/redux/actions/userAction.js index 2a19606fe8..58cc286a7f 100644 --- a/src/redux/actions/userAction.js +++ b/src/redux/actions/userAction.js @@ -6,65 +6,99 @@ import { UNFOLLOW_USER_SUCCESS, UNFOLLOW_USER_FAIL, TOAST_NOTIFICATION, + FETCH_LEADERBOARD, + FETCH_LEADERBOARD_SUCCESS, + FETCH_LEADERBOARD_FAIL, } from '../constants/constants'; import { followUser as followUserReq } from '../../providers/hive/dhive'; +import { getLeaderboard } from '../../providers/ecency/ecency'; -export const followUser = (currentAccount, pin, data) => { +export const followUser = (currentAccount, pin, data, successToastText, failToastText) => { return (dispatch) => { - dispatch({ - type: FOLLOW_USER, - }); - console.log('followUser', currentAccount, pin, data); + dispatch({ type: FOLLOW_USER }); followUserReq(currentAccount, pin, data) - .then((res) => - dispatch({ - payload: res, - type: FOLLOW_USER_SUCCESS, - }), - ) - .catch((err) => - dispatch({ - payload: err, - type: FOLLOW_USER_FAIL, - }), - ); + .then((res) => dispatch(followUserSuccess(data, successToastText))) + .catch((err) => dispatch(followUserFail(err, failToastText))); }; }; -export const followUserSuccess = (payload) => { +export const followUserSuccess = (userData, successToastText) => { + return (dispatch) => [ + dispatch({ + payload: userData, + type: FOLLOW_USER_SUCCESS, + }), + dispatch({ + payload: successToastText, + type: TOAST_NOTIFICATION, + }), + ]; +}; + +export const followUserFail = (error, failToastText) => { + return (dispatch) => [ + dispatch({ + payload: error, + type: FOLLOW_USER_FAIL, + }), + dispatch({ + payload: failToastText, + type: TOAST_NOTIFICATION, + }), + ]; +}; + +export const unfollowUser = (currentAccount, pin, data, successToastText, failToastText) => { return (dispatch) => { - // dispatch({ - // payload, - // type: FOLLOW_USER_SUCCESS, - // }); - // dispatch({ - // payload: 'done', - // type: TOAST_NOTIFICATION, - // }); - // toastNotification( - // intl.formatMessage({ - // //id: isFollowing ? 'alert.success_unfollow' : 'alert.success_follow', - // }), - // ), + dispatch({ type: UNFOLLOW_USER }); + followUserReq(currentAccount, pin, data) + .then((res) => dispatch(unfollowUserSuccess(data, successToastText))) + .catch((err) => dispatch(unfollowUserFail(err, failToastText))); }; }; -export const followUserFail = (payload) => ({ - payload, - type: FOLLOW_USER_FAIL, -}); +export const unfollowUserSuccess = (userData, successToastText) => { + return (dispatch) => [ + dispatch({ + payload: userData, + type: UNFOLLOW_USER_SUCCESS, + }), + dispatch({ + payload: successToastText, + type: TOAST_NOTIFICATION, + }), + ]; +}; -export const unfollowUser = ({ currentAccount, pin, data }) => ({ - type: UNFOLLOW_USER, -}); +export const unfollowUserFail = (error, failToastText) => { + return (dispatch) => [ + dispatch({ + payload: error, + type: UNFOLLOW_USER_FAIL, + }), + dispatch({ + payload: failToastText, + type: TOAST_NOTIFICATION, + }), + ]; +}; + +export const fetchLeaderboard = (duration) => { + return (dispatch) => { + dispatch({ type: FETCH_LEADERBOARD }); + getLeaderboard(duration) + .then((res) => dispatch(fetchLeaderboardSuccess(res))) + .catch((err) => dispatch(fetchLeaderboardFail(err))); + }; +}; -export const unfollowUserSuccess = (payload) => ({ +export const fetchLeaderboardSuccess = (payload) => ({ payload, - type: UNFOLLOW_USER_SUCCESS, + type: FETCH_LEADERBOARD_SUCCESS, }); -export const funollowUserFail = (payload) => ({ +export const fetchLeaderboardFail = (payload) => ({ payload, - type: UNFOLLOW_USER_FAIL, + type: FETCH_LEADERBOARD_FAIL, }); diff --git a/src/redux/constants/constants.js b/src/redux/constants/constants.js index 305713c971..39384d7b44 100644 --- a/src/redux/constants/constants.js +++ b/src/redux/constants/constants.js @@ -74,3 +74,6 @@ export const FOLLOW_USER_FAIL = 'FOLLOW_USER_FAIL'; export const UNFOLLOW_USER = 'UNFOLLOW_USER'; export const UNFOLLOW_USER_SUCCESS = 'UNFOLLOW_USER_SUCCESS'; export const UNFOLLOW_USER_FAIL = 'UNFOLLOW_USER_FAIL'; +export const FETCH_LEADERBOARD = 'FETCH_LEADERBOARD'; +export const FETCH_LEADERBOARD_SUCCESS = 'FETCH_LEADERBOARD_SUCCESS'; +export const FETCH_LEADERBOARD_FAIL = 'FETCH_LEADERBOARD_FAIL'; diff --git a/src/redux/reducers/userReducer.js b/src/redux/reducers/userReducer.js index 0dda9b4085..110f5d31fa 100644 --- a/src/redux/reducers/userReducer.js +++ b/src/redux/reducers/userReducer.js @@ -5,6 +5,9 @@ import { UNFOLLOW_USER, UNFOLLOW_USER_SUCCESS, UNFOLLOW_USER_FAIL, + FETCH_LEADERBOARD, + FETCH_LEADERBOARD_SUCCESS, + FETCH_LEADERBOARD_FAIL, } from '../constants/constants'; const initialState = { @@ -18,10 +21,14 @@ const initialState = { loading: false, error: false, }, + leaderboard: { + data: [], + loading: false, + error: false, + }, }; export default function (state = initialState, action) { - console.log(action.type, action.payload); switch (action.type) { case FOLLOW_USER: return { @@ -77,6 +84,33 @@ export default function (state = initialState, action) { error: action.payload, }, }; + case FETCH_LEADERBOARD: + return { + ...state, + leaderboard: { + data: [], + loading: true, + error: false, + }, + }; + case FETCH_LEADERBOARD_SUCCESS: + return { + ...state, + leaderboard: { + data: action.payload, + loading: false, + error: false, + }, + }; + case FETCH_LEADERBOARD_FAIL: + return { + ...state, + leaderboard: { + data: [], + loading: false, + error: action.payload, + }, + }; default: return state; } diff --git a/src/redux/store/store.js b/src/redux/store/store.js index 60ecba8a94..b05b44d48f 100644 --- a/src/redux/store/store.js +++ b/src/redux/store/store.js @@ -13,7 +13,7 @@ const persistConfig = { // Storage Method (React Native) storage: AsyncStorage, // Blacklist (Don't Save Specific Reducers) - blacklist: ['nav', 'application'], + blacklist: ['nav', 'application', 'communities', 'user'], timeout: 0, }; From d2b4739024aa54af879d1eccbc856e79b438f30c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sat, 19 Dec 2020 22:57:50 +0300 Subject: [PATCH 045/505] Follow and unfollow user implemented completely --- .../view/userListItem/userListItem.js | 4 +++- .../posts/container/postsContainer.js | 17 ++++++++++++++--- src/components/posts/view/postsView.js | 9 ++++++--- src/redux/actions/userAction.js | 11 +++++++---- src/redux/reducers/userReducer.js | 4 ++-- 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index 079b4bfdb6..ff6544e967 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -59,7 +59,9 @@ const UserListItem = ({ )} {isHasRightItem && (isLoadingRightAction ? ( - + + + ) : ( {}, [lastUnfollowedUser]); + useEffect(() => { + if (!lastUnfollowedUser.loading) { + if (!lastUnfollowedUser.error && !isEmpty(lastUnfollowedUser.data)) { + const recommendeds = [...recommendedUsers]; + recommendeds.forEach((item) => { + if (item._id === lastUnfollowedUser.data.following) { + item.isFollowing = false; + } + }); + + setRecommendedUsers(recommendeds); + } + } + }, [lastUnfollowedUser]); const _setFeedPosts = (_posts) => { dispatch(setFeedPosts(_posts)); diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index 593c3eb5ab..d92b60fbae 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -57,7 +57,7 @@ const PostsView = ({ handleFollowUserButtonPress, handleSubscribeCommunityButtonPress, lastFollowedUser, - isUnfollowLoading, + lastUnfollowedUser, }) => { const intl = useIntl(); const postsList = useRef(null); @@ -136,7 +136,7 @@ const PostsView = ({ if (isNoPost) { if (selectedFilterValue === 'feed') { if (selectedFeedSubfilterValue === 'friends') { - console.log('lastFollowedUser', lastFollowedUser); + console.log('lastFollowedUser', lastFollowedUser, lastUnfollowedUser, recommendedUsers); return ( <> @@ -156,7 +156,10 @@ const PostsView = ({ } isRightColor={item.isFollowing} isFollowing={item.isFollowing} - isLoadingRightAction={lastFollowedUser.loading} + isLoadingRightAction={ + (lastFollowedUser.data.following === item._id && lastFollowedUser.loading) || + (lastUnfollowedUser.data.following === item._id && lastUnfollowedUser.loading) + } onPressRightText={handleFollowUserButtonPress} handleOnPress={(username) => navigation.navigate({ diff --git a/src/redux/actions/userAction.js b/src/redux/actions/userAction.js index 58cc286a7f..6469495ced 100644 --- a/src/redux/actions/userAction.js +++ b/src/redux/actions/userAction.js @@ -11,12 +11,15 @@ import { FETCH_LEADERBOARD_FAIL, } from '../constants/constants'; -import { followUser as followUserReq } from '../../providers/hive/dhive'; +import { + followUser as followUserReq, + unfollowUser as unfollowUserReq, +} from '../../providers/hive/dhive'; import { getLeaderboard } from '../../providers/ecency/ecency'; export const followUser = (currentAccount, pin, data, successToastText, failToastText) => { return (dispatch) => { - dispatch({ type: FOLLOW_USER }); + dispatch({ type: FOLLOW_USER, payload: data }); followUserReq(currentAccount, pin, data) .then((res) => dispatch(followUserSuccess(data, successToastText))) .catch((err) => dispatch(followUserFail(err, failToastText))); @@ -51,8 +54,8 @@ export const followUserFail = (error, failToastText) => { export const unfollowUser = (currentAccount, pin, data, successToastText, failToastText) => { return (dispatch) => { - dispatch({ type: UNFOLLOW_USER }); - followUserReq(currentAccount, pin, data) + dispatch({ type: UNFOLLOW_USER, payload: data }); + unfollowUserReq(currentAccount, pin, data) .then((res) => dispatch(unfollowUserSuccess(data, successToastText))) .catch((err) => dispatch(unfollowUserFail(err, failToastText))); }; diff --git a/src/redux/reducers/userReducer.js b/src/redux/reducers/userReducer.js index 110f5d31fa..0170366ea1 100644 --- a/src/redux/reducers/userReducer.js +++ b/src/redux/reducers/userReducer.js @@ -34,7 +34,7 @@ export default function (state = initialState, action) { return { ...state, followUser: { - data: {}, + data: action.payload, loading: true, error: false, }, @@ -61,7 +61,7 @@ export default function (state = initialState, action) { return { ...state, unfollowUser: { - data: {}, + data: action.payload, loading: true, error: false, }, From 63603e6803504fe5aad19d3a403d9060e8cf14d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 20 Dec 2020 00:04:36 +0300 Subject: [PATCH 046/505] Implement subscribe&leave community to feed screen --- .../communityListItem/communityListItem.js | 49 ++++++----- .../communityListItemStyles.js | 8 ++ .../view/userListItem/userListItem.js | 2 + .../posts/container/postsContainer.js | 79 +++++++++++++++-- src/components/posts/view/postsView.js | 13 ++- src/config/locales/en-US.json | 4 + src/redux/actions/communitiesAction.js | 86 +++++++++++++++++++ src/redux/constants/constants.js | 6 ++ src/redux/reducers/communitiesReducer.js | 70 +++++++++++++++ 9 files changed, 282 insertions(+), 35 deletions(-) diff --git a/src/components/basicUIElements/view/communityListItem/communityListItem.js b/src/components/basicUIElements/view/communityListItem/communityListItem.js index d0e0bdcf01..f0a7fc7a44 100644 --- a/src/components/basicUIElements/view/communityListItem/communityListItem.js +++ b/src/components/basicUIElements/view/communityListItem/communityListItem.js @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { View, Text, TouchableOpacity } from 'react-native'; +import { View, Text, TouchableOpacity, ActivityIndicator } from 'react-native'; import { useIntl } from 'react-intl'; import styles from './communityListItemStyles'; @@ -22,14 +22,12 @@ const CommunityListItem = ({ handleSubscribeButtonPress, isSubscribed, isLoggedIn, + isLoadingRightAction, }) => { - const [subscribed, setSubscribed] = useState(isSubscribed); const intl = useIntl(); const _handleSubscribeButtonPress = () => { - handleSubscribeButtonPress({ subscribed: !subscribed, communityId: name }).then(() => { - setSubscribed(!subscribed); - }); + handleSubscribeButtonPress({ isSubscribed, communityId: name }); }; return ( @@ -41,24 +39,29 @@ const CommunityListItem = ({ {title} - {isLoggedIn && ( - - )} + {isLoggedIn && + (isLoadingRightAction ? ( + + + + ) : ( + + ))} {!!about && {about}} diff --git a/src/components/basicUIElements/view/communityListItem/communityListItemStyles.js b/src/components/basicUIElements/view/communityListItem/communityListItemStyles.js index 19880705c4..771ba597bd 100644 --- a/src/components/basicUIElements/view/communityListItem/communityListItemStyles.js +++ b/src/components/basicUIElements/view/communityListItem/communityListItemStyles.js @@ -59,4 +59,12 @@ export default EStyleSheet.create({ flexDirection: 'row', justifyContent: 'space-between', }, + joinTag: { + width: 60, + alignItems: 'center', + justifyContent: 'center', + }, + activityIndicator: { + width: 30, + }, }); diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index ff6544e967..7ed91d6d7b 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -23,6 +23,7 @@ const UserListItem = ({ onPressRightText, isFollowing = false, isLoadingRightAction = false, + isLoggedIn, }) => { const _handleSubscribeButtonPress = () => { const _data = {}; @@ -58,6 +59,7 @@ const UserListItem = ({ )} {isHasRightItem && + isLoggedIn && (isLoadingRightAction ? ( diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index efccae635c..c0a64e971e 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -10,7 +10,6 @@ import { getAccountPosts, getPost, getRankedPosts, - subscribeCommunity, getCommunity, } from '../../../providers/hive/dhive'; import { getPromotePosts } from '../../../providers/ecency/ecency'; @@ -22,9 +21,13 @@ import PostsView from '../view/postsView'; import { setFeedPosts } from '../../../redux/actions/postsAction'; import { hidePostsThumbnails } from '../../../redux/actions/uiAction'; import { fetchLeaderboard, followUser, unfollowUser } from '../../../redux/actions/userAction'; +import { + subscribeCommunity, + leaveCommunity, + fetchCommunities, +} from '../../../redux/actions/communitiesAction'; import useIsMountedRef from '../../../customHooks/useIsMountedRef'; -import { fetchCommunities } from '../../../redux/actions/communitiesAction'; const PostsContainer = ({ changeForceLoadPostState, @@ -56,6 +59,8 @@ const PostsContainer = ({ const communities = useSelector((state) => state.communities.communities); const lastFollowedUser = useSelector((state) => state.user.followUser); const lastUnfollowedUser = useSelector((state) => state.user.unfollowUser); + const lastSubscribedCommunity = useSelector((state) => state.communities.subscribeCommunity); + const lastLeftCommunity = useSelector((state) => state.communities.leaveCommunity); const [isNoPost, setIsNoPost] = useState(false); const [startPermlink, setStartPermlink] = useState(''); @@ -177,6 +182,36 @@ const PostsContainer = ({ } }, [lastUnfollowedUser]); + useEffect(() => { + if (!lastSubscribedCommunity.loading) { + if (!lastSubscribedCommunity.error && !isEmpty(lastSubscribedCommunity.data)) { + const recommendeds = [...recommendedCommunities]; + recommendeds.forEach((item) => { + if (item.name === lastSubscribedCommunity.data.communityId) { + item.isSubscribed = true; + } + }); + + setRecommendedCommunities(recommendeds); + } + } + }, [lastSubscribedCommunity]); + + useEffect(() => { + if (!lastLeftCommunity.loading) { + if (!lastLeftCommunity.error && !isEmpty(lastLeftCommunity.data)) { + const recommendeds = [...recommendedCommunities]; + recommendeds.forEach((item) => { + if (item.name === lastLeftCommunity.data.communityId) { + item.isSubscribed = false; + } + }); + + setRecommendedCommunities(recommendeds); + } + } + }, [lastLeftCommunity]); + const _setFeedPosts = (_posts) => { dispatch(setFeedPosts(_posts)); }; @@ -360,7 +395,7 @@ const PostsContainer = ({ recommendeds.unshift({ _id: 'good-karma' }); recommendeds.unshift({ _id: 'ecency' }); - recommendeds.forEach((item) => ({ ...item, isFollowing: false })); + recommendeds.forEach((item) => Object.assign(item, { isFollowing: false })); setRecommendedUsers(recommendeds); }; @@ -372,7 +407,7 @@ const PostsContainer = ({ const ecency = await getCommunity('hive-125125'); const recommendeds = [ecency, ...communitiesArray]; - recommendeds.forEach((item) => ({ ...item, isJoined: false })); + recommendeds.forEach((item) => Object.assign(item, { isSubscribed: false })); setRecommendedCommunities(recommendeds); } catch (err) { @@ -380,7 +415,7 @@ const PostsContainer = ({ } }; - const _handleFollowUserButtonPress = (_data, isFollowing) => { + const _handleFollowUserButtonPress = (data, isFollowing) => { let followAction; let successToastText = ''; let failToastText = ''; @@ -405,13 +440,37 @@ const PostsContainer = ({ }); } - _data.follower = get(currentAccount, 'name', ''); + data.follower = get(currentAccount, 'name', ''); - dispatch(followAction(currentAccount, pinCode, _data, successToastText, failToastText)); + dispatch(followAction(currentAccount, pinCode, data, successToastText, failToastText)); }; - const _handleSubscribeCommunityButtonPress = (_data) => { - return subscribeCommunity(currentAccount, pinCode, _data); + const _handleSubscribeCommunityButtonPress = (data) => { + let subscribeAction; + let successToastText = ''; + let failToastText = ''; + + if (!data.isSubscribed) { + subscribeAction = subscribeCommunity; + + successToastText = intl.formatMessage({ + id: 'alert.success_subscribe', + }); + failToastText = intl.formatMessage({ + id: 'alert.fail_subscribe', + }); + } else { + subscribeAction = leaveCommunity; + + successToastText = intl.formatMessage({ + id: 'alert.success_leave', + }); + failToastText = intl.formatMessage({ + id: 'alert.fail_leave', + }); + } + + dispatch(subscribeAction(currentAccount, pinCode, data, successToastText, failToastText)); }; return ( @@ -451,6 +510,8 @@ const PostsContainer = ({ handleSubscribeCommunityButtonPress={_handleSubscribeCommunityButtonPress} lastFollowedUser={lastFollowedUser} lastUnfollowedUser={lastUnfollowedUser} + lastSubscribedCommunity={lastSubscribedCommunity} + lastLeftCommunity={lastLeftCommunity} /> ); }; diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index d92b60fbae..bf2a49ebdb 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -58,12 +58,13 @@ const PostsView = ({ handleSubscribeCommunityButtonPress, lastFollowedUser, lastUnfollowedUser, + lastSubscribedCommunity, + lastLeftCommunity, }) => { const intl = useIntl(); const postsList = useRef(null); useEffect(() => { - console.log('useEffect', isNoPost, selectedFilterValue, selectedFeedSubfilterValue); if (isNoPost) { if (selectedFilterValue === 'feed') { if (selectedFeedSubfilterValue === 'friends') { @@ -136,7 +137,6 @@ const PostsView = ({ if (isNoPost) { if (selectedFilterValue === 'feed') { if (selectedFeedSubfilterValue === 'friends') { - console.log('lastFollowedUser', lastFollowedUser, lastUnfollowedUser, recommendedUsers); return ( <> @@ -155,6 +155,7 @@ const PostsView = ({ : intl.formatMessage({ id: 'user.follow' }) } isRightColor={item.isFollowing} + isLoggedIn={isLoggedIn} isFollowing={item.isFollowing} isLoadingRightAction={ (lastFollowedUser.data.following === item._id && lastFollowedUser.loading) || @@ -204,7 +205,13 @@ const PostsView = ({ }) } handleSubscribeButtonPress={handleSubscribeCommunityButtonPress} - isSubscribed={false} + isSubscribed={item.isSubscribed} + isLoadingRightAction={ + (lastSubscribedCommunity.data.communityId === item.name && + lastSubscribedCommunity.loading) || + (lastLeftCommunity.data.communityId === item.name && + lastLeftCommunity.loading) + } isLoggedIn={isLoggedIn} /> )} diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 7e15a7eddf..81d4f0ef68 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -321,6 +321,10 @@ "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", diff --git a/src/redux/actions/communitiesAction.js b/src/redux/actions/communitiesAction.js index 33c82abe56..423c07448d 100644 --- a/src/redux/actions/communitiesAction.js +++ b/src/redux/actions/communitiesAction.js @@ -5,10 +5,19 @@ import { FETCH_SUBSCRIBED_COMMUNITIES, FETCH_SUBSCRIBED_COMMUNITIES_SUCCESS, FETCH_SUBSCRIBED_COMMUNITIES_FAIL, + SUBSCRIBE_COMMUNITY, + SUBSCRIBE_COMMUNITY_SUCCESS, + SUBSCRIBE_COMMUNITY_FAIL, + LEAVE_COMMUNITY, + LEAVE_COMMUNITY_SUCCESS, + LEAVE_COMMUNITY_FAIL, + TOAST_NOTIFICATION, } from '../constants/constants'; import { getCommunities, getSubscriptions } from '../../providers/hive/hive'; +import { subscribeCommunity as subscribeCommunityReq } from '../../providers/hive/dhive'; +// Fetch Communities export const fetchCommunities = (last, limit, query, sort, observer) => { return (dispatch) => { dispatch({ type: FETCH_COMMUNITIES }); @@ -17,15 +26,18 @@ export const fetchCommunities = (last, limit, query, sort, observer) => { .catch((err) => dispatch(fetchCommunitiesFail(err))); }; }; + export const fetchCommunitiesSuccess = (payload) => ({ payload, type: FETCH_COMMUNITIES_SUCCESS, }); + export const fetchCommunitiesFail = (payload) => ({ payload, type: FETCH_COMMUNITIES_FAIL, }); +// Fetch Subscribed Communities export const fetchSubscribedCommunities = (username) => { return (dispatch) => { dispatch({ type: FETCH_SUBSCRIBED_COMMUNITIES }); @@ -34,11 +46,85 @@ export const fetchSubscribedCommunities = (username) => { .catch((err) => dispatch(fetchSubscribedCommunitiesFail(err))); }; }; + export const fetchSubscribedCommunitiesSuccess = (payload) => ({ payload, type: FETCH_SUBSCRIBED_COMMUNITIES_SUCCESS, }); + export const fetchSubscribedCommunitiesFail = (payload) => ({ payload, type: FETCH_SUBSCRIBED_COMMUNITIES_FAIL, }); + +// Subscribe Community +export const subscribeCommunity = (currentAccount, pin, data, successToastText, failToastText) => { + return (dispatch) => { + dispatch({ type: SUBSCRIBE_COMMUNITY, payload: data }); + subscribeCommunityReq(currentAccount, pin, data) + .then((res) => dispatch(subscribeCommunitySuccess(data, successToastText))) + .catch((err) => dispatch(subscribeCommunityFail(err, failToastText))); + }; +}; + +export const subscribeCommunitySuccess = (communityData, successToastText) => { + return (dispatch) => [ + dispatch({ + payload: communityData, + type: SUBSCRIBE_COMMUNITY_SUCCESS, + }), + dispatch({ + payload: successToastText, + type: TOAST_NOTIFICATION, + }), + ]; +}; + +export const subscribeCommunityFail = (error, failToastText) => { + return (dispatch) => [ + dispatch({ + payload: error, + type: SUBSCRIBE_COMMUNITY_FAIL, + }), + dispatch({ + payload: failToastText, + type: TOAST_NOTIFICATION, + }), + ]; +}; + +// Leave Community +export const leaveCommunity = (currentAccount, pin, data, successToastText, failToastText) => { + return (dispatch) => { + dispatch({ type: LEAVE_COMMUNITY, payload: data }); + subscribeCommunityReq(currentAccount, pin, data) + .then((res) => dispatch(leaveCommunitySuccess(data, successToastText))) + .catch((err) => dispatch(leaveCommunityFail(err, failToastText))); + }; +}; + +export const leaveCommunitySuccess = (communityData, successToastText) => { + return (dispatch) => [ + dispatch({ + payload: communityData, + type: LEAVE_COMMUNITY_SUCCESS, + }), + dispatch({ + payload: successToastText, + type: TOAST_NOTIFICATION, + }), + ]; +}; + +export const leaveCommunityFail = (error, failToastText) => { + return (dispatch) => [ + dispatch({ + payload: error, + type: LEAVE_COMMUNITY_FAIL, + }), + dispatch({ + payload: failToastText, + type: TOAST_NOTIFICATION, + }), + ]; +}; diff --git a/src/redux/constants/constants.js b/src/redux/constants/constants.js index 39384d7b44..de0e0e9a97 100644 --- a/src/redux/constants/constants.js +++ b/src/redux/constants/constants.js @@ -66,6 +66,12 @@ export const FETCH_COMMUNITIES_FAIL = 'FETCH_COMMUNITIES_FAIL'; export const FETCH_SUBSCRIBED_COMMUNITIES = 'FETCH_SUBSCRIBED_COMMUNITIES'; export const FETCH_SUBSCRIBED_COMMUNITIES_SUCCESS = 'FETCH_SUBSCRIBED_COMMUNITIES_SUCCESS'; export const FETCH_SUBSCRIBED_COMMUNITIES_FAIL = 'FETCH_SUBSCRIBED_COMMUNITIES_FAIL'; +export const SUBSCRIBE_COMMUNITY = 'SUBSCRIBE_COMMUNITY'; +export const SUBSCRIBE_COMMUNITY_SUCCESS = 'SUBSCRIBE_COMMUNITY_SUCCESS'; +export const SUBSCRIBE_COMMUNITY_FAIL = 'SUBSCRIBE_COMMUNITY_FAIL'; +export const LEAVE_COMMUNITY = 'LEAVE_COMMUNITY'; +export const LEAVE_COMMUNITY_SUCCESS = 'LEAVE_COMMUNITY_SUCCESS'; +export const LEAVE_COMMUNITY_FAIL = 'LEAVE_COMMUNITY_FAIL'; // USER export const FOLLOW_USER = 'FOLLOW_USER'; diff --git a/src/redux/reducers/communitiesReducer.js b/src/redux/reducers/communitiesReducer.js index 063d36c428..f9f4857f62 100644 --- a/src/redux/reducers/communitiesReducer.js +++ b/src/redux/reducers/communitiesReducer.js @@ -5,6 +5,12 @@ import { FETCH_SUBSCRIBED_COMMUNITIES, FETCH_SUBSCRIBED_COMMUNITIES_SUCCESS, FETCH_SUBSCRIBED_COMMUNITIES_FAIL, + SUBSCRIBE_COMMUNITY, + SUBSCRIBE_COMMUNITY_SUCCESS, + SUBSCRIBE_COMMUNITY_FAIL, + LEAVE_COMMUNITY, + LEAVE_COMMUNITY_SUCCESS, + LEAVE_COMMUNITY_FAIL, } from '../constants/constants'; const initialState = { @@ -18,6 +24,16 @@ const initialState = { loading: false, error: false, }, + subscribeCommunity: { + data: {}, + loading: false, + error: false, + }, + leaveCommunity: { + data: {}, + loading: false, + error: false, + }, }; export default function (state = initialState, action) { @@ -76,6 +92,60 @@ export default function (state = initialState, action) { error: action.payload, }, }; + case SUBSCRIBE_COMMUNITY: + return { + ...state, + subscribeCommunity: { + data: action.payload, + loading: true, + error: false, + }, + }; + case SUBSCRIBE_COMMUNITY_SUCCESS: + return { + ...state, + subscribeCommunity: { + data: action.payload, + loading: false, + error: false, + }, + }; + case SUBSCRIBE_COMMUNITY_FAIL: + return { + ...state, + subscribeCommunity: { + data: {}, + loading: false, + error: action.payload, + }, + }; + case LEAVE_COMMUNITY: + return { + ...state, + leaveCommunity: { + data: action.payload, + loading: true, + error: false, + }, + }; + case LEAVE_COMMUNITY_SUCCESS: + return { + ...state, + leaveCommunity: { + data: action.payload, + loading: false, + error: false, + }, + }; + case LEAVE_COMMUNITY_FAIL: + return { + ...state, + leaveCommunity: { + data: {}, + loading: false, + error: action.payload, + }, + }; default: return state; } From 3c2facce5ae092a484cf200a825d5dd9d0fda0de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 20 Dec 2020 00:08:59 +0300 Subject: [PATCH 047/505] Add comments to UserAction --- src/redux/actions/userAction.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/redux/actions/userAction.js b/src/redux/actions/userAction.js index 6469495ced..60ca50e11e 100644 --- a/src/redux/actions/userAction.js +++ b/src/redux/actions/userAction.js @@ -17,6 +17,7 @@ import { } from '../../providers/hive/dhive'; import { getLeaderboard } from '../../providers/ecency/ecency'; +// Follow User export const followUser = (currentAccount, pin, data, successToastText, failToastText) => { return (dispatch) => { dispatch({ type: FOLLOW_USER, payload: data }); @@ -52,6 +53,7 @@ export const followUserFail = (error, failToastText) => { ]; }; +// Unfollow User export const unfollowUser = (currentAccount, pin, data, successToastText, failToastText) => { return (dispatch) => { dispatch({ type: UNFOLLOW_USER, payload: data }); @@ -87,6 +89,7 @@ export const unfollowUserFail = (error, failToastText) => { ]; }; +// Fetch Leaderboard export const fetchLeaderboard = (duration) => { return (dispatch) => { dispatch({ type: FETCH_LEADERBOARD }); From 58135f7c69bee97007457a35a6d7192c45ba99f4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 20 Dec 2020 13:34:17 +0200 Subject: [PATCH 048/505] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index 466784f31a..6687bd8497 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -21,7 +21,7 @@ "delegation": "Delegasyon", "delegations": "Mga Delegasyon", "delegation_title": "Delegasyon na gantimpala", - "delegation_desc": "Earn Points everyday for delegation", + "delegation_desc": "Kumita ng Points araw-araw sa mga delegasyon", "post_title": "Puntos para sa post", "comment_title": "Puntos para sa komento", "vote_title": "Puntos para sa boto", @@ -30,7 +30,7 @@ "checkin_title": "Puntos para sa tibok ng puso", "referral": "Referral", "referral_title": "Gantimpala sa mga Referral", - "referral_desc": "Invite friends and earn Points", + "referral_desc": "Mag-anyaya ng mga kaibigan at kumita ng Points", "checkin_extra_title": "Bonus sa pag-gamit", "no_activity": "Walang aktibidad kamakailan", "outgoing_transfer_description": "", @@ -59,8 +59,8 @@ "to_placeholder": "Username", "memo_placeholder": "I-enter ang iyong lista dito", "transfer_token": "Paglipat", - "purchase_estm": "GET POINTS", - "points": "Gift Points to someone", + "purchase_estm": "MAGKAROON NG POINTS", + "points": "Magregalo ng Points sa iba", "transfer_to_saving": "Patungong Saving", "powerUp": "Power Up", "withdraw_to_saving": "I-withdraw ang inipon", @@ -83,7 +83,7 @@ "fill_vesting_withdraw": "Ang pag-powerdown ay naisagawa", "estm": { "title": "Puntos", - "buy": "GET POINTS" + "buy": "MAGKAROON NG POINTS" }, "savingsteem": { "title": "Inipong HIVE" @@ -118,7 +118,7 @@ "ignore": "ayaw kang makita", "reblog": "nireblogged", "transfer": "nailipat", - "spin": "Time to earn more Points", + "spin": "Panahon na para kumita ng mas maraming Points", "inactive": "Maging aktibo! Magsulat ng post, kumita ng tuloy-tuloy", "referral": "sumali gamit ang iyong referral, salubungin sila", "notification": "Mga Abiso", @@ -159,7 +159,7 @@ "voting_power": "Lakas ng pagboto", "login_to_see": "Mag login para makita", "follow_people": "Sundan ang ibang tao para punan ang iyong feed", - "follow_communities": "Join some communities to fill your feed", + "follow_communities": "Sumali sa ilang komunidad para mapuno ang iyong feed", "havent_commented": "wala pang na i-komentong bagay", "havent_posted": "wala pang na i-post na kahit anong bagay", "steem_power": "Hive Power", @@ -214,10 +214,10 @@ "login": { "signin": "Mag sign in", "signup": "SUMALI NGAYON", - "signin_title": "To get all the benefits of using Ecency", + "signin_title": "Para makuha ang lahat ng benepisyo ng paggamit ng Ecency", "username": "Username", "password": "Password or WIF", - "description": "By signing in, you agree to our Terms of Services and Privacy Policies.", + "description": "Sa pag-sign in, pumapayag ka sa mga Tuntunin ng Paggamit at Mga Patakaran sa Privacy.", "cancel": "kansel", "login": "LOGIN", "steemconnect_description": "Kung ayaw mong itago ang encrypted password mo sa device mo, gamitin ang Hivesigner.", From 967596741276f47c9d8e3e0229d0d111a6767a7c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 20 Dec 2020 13:44:31 +0200 Subject: [PATCH 049/505] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 68 +++++++++++++++++----------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index 6687bd8497..9131b111f1 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -31,7 +31,7 @@ "referral": "Referral", "referral_title": "Gantimpala sa mga Referral", "referral_desc": "Mag-anyaya ng mga kaibigan at kumita ng Points", - "checkin_extra_title": "Bonus sa pag-gamit", + "checkin_extra_title": "Bonus sa paggamit", "no_activity": "Walang aktibidad kamakailan", "outgoing_transfer_description": "", "incoming_transfer_description": "", @@ -224,14 +224,14 @@ "steemconnect_fee_description": "impormasyon" }, "register": { - "button": "Sign Up", + "button": "Sumali", "title": "Mag sign up", - "username": "Pick a username", - "mail": "Enter your email address", - "ref_user": "Referred user (Optional)", - "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", - "title_description": "One account to manage everything", - "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." + "username": "Pumili ng username", + "mail": "Ilagay ang iyong email address", + "ref_user": "Napasaling user (opsyunal)", + "500_error": "Ang iyong request ay hindi maproseso, ang pila ng pagsali ay maaaring puno na! Subukan ulit nang ilang minuto...", + "title_description": "Isang account para asikasuhin ang lahat", + "form_description": "Sa pag-sign in, pumapayag ka sa mga Tuntunin ng Paggamit at Mga Patakaran sa Privacy." }, "home": { "feed": "Feed", @@ -241,8 +241,8 @@ "new": "Bago", "blog": "Blog", "posts": "Post", - "friends": "Friends", - "communities": "Communities" + "friends": "Mga kaibigan", + "communities": "Mga pamayanan" }, "side_menu": { "profile": "Profile", @@ -281,19 +281,19 @@ "limited_dash": "Gumamit ng isang gatlang bawat tag", "limited_space": "Gumamit ng puwang para mapaghiwalay ang bawat tag", "limited_lowercase": "Gumamit lamang ng maliliit na letra sa mga tag", - "limited_characters": "Use only lowercase letters, digits and one dash", + "limited_characters": "Gumamit lamang ng maliliit na mga titik, mga numero, at isang gitling", "limited_firstchar": "Dapat nag-uumpisa sa letra ang bawat tag", "limited_lastchar": "Dapat nakatapus sa letra o numero ang tag", - "setting_schedule": "Scheduling Time", - "setting_reward": "Reward", - "setting_beneficiary": "Beneficiary", + "setting_schedule": "Oras ng Iskedyul", + "setting_reward": "Gantimpala", + "setting_beneficiary": "Benepisyaryo", "reward_default": "Default 50% / 50%", "reward_power_up": "Power Up 100%", - "reward_decline": "Decline Payout", - "beneficiaries": "Beneficiaries", - "options": "Options", - "my_blog": "My Blog", - "my_communities": "My Communities", + "reward_decline": "Tanggihan ang Payout", + "beneficiaries": "Mga Benepisyaryo", + "options": "Mga Pagpipilian", + "my_blog": "Aking blog", + "my_communities": "Aking mga pamayanan", "top_communities": "Top Communities" }, "pincode": { @@ -310,11 +310,11 @@ "fail": "Bigo!", "move": "Ilipat", "move_question": "Sigurado kang ililipat mo sa drafts?", - "success_shared": "Success! Content submitted!", + "success_shared": "Tagumpay! Ang nilalaman ay naipasa na!", "success_moved": "Nailipat sa draft", "permission_denied": "Hindi pinahintulutan", "permission_text": "Please, go to phone Settings and change Ecency app permissions.", - "key_warning": "Operation requires active key or master password, please relogin!", + "key_warning": "Ang operasyon ay nangangailangan ng active key o master password, palogin ulit!", "success_rebloged": "Rebloged!", "already_rebloged": "Naibahagi mo na ito!", "success_favorite": "Paborito ay nadagdag!", @@ -349,13 +349,13 @@ "payloadTooLarge": "Masyadong malaki ang file, maaaring baguhin ang laki nito o mag-upload ng mas maliit na imahe", "qoutaExceeded": "Umabot na sa limit sa pag-upload", "invalidImage": "Inbalidong imahe, subukan ang ibang file", - "something_wrong": "Something went wrong.", - "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong": "May nangyaring problema.", + "something_wrong_alt": "Subukan ang https://ecency.com", + "something_wrong_reload": "I-reload" }, "post": { "reblog_alert": "Sigurado ka, gusto mong i-reblog?", - "removed_hint": "Content is not available", + "removed_hint": "Ang nilalaman ay hindi makuha", "copy_link": "Kopyahin ang link", "reblogged": "ni-reblog ni", "sponsored": "SPONSORED", @@ -404,7 +404,7 @@ "invalid_username": "Maling username, maaaring suriin at subukan ulit", "already_logged": "Ikaw ay naka login na, maaaring subukan na magdagdag ng ibang account", "invalid_credentials": "Maling credentials, maaaring suriin at subukan ulit", - "unknow_error": "Unknown error, please write to support@ecency.com" + "unknow_error": "Hindi malaman na error, maaaring sumulat sa support@ecency.com" }, "payout": { "potential_payout": "Potensyal na Payout", @@ -424,7 +424,7 @@ "bookmarks": "idagdag sa mga bookmark", "promote": "i-promote", "boost": "i-boost", - "report": "report" + "report": "iulat" }, "deep_link": { "no_existing_user": "Walang makita na user", @@ -457,7 +457,7 @@ "transfer_token": "Paglipat", "purchase_estm": "Purchase Points", "convert": "I-convert ang HBD bilang HIVE", - "points": "Gift Points to someone", + "points": "Iregalo ang Points sa iba", "transfer_to_saving": "Ilipat sa Ipon", "powerUp": "Power Up", "withdraw_to_saving": "I-withdraw sa Inipon", @@ -479,8 +479,8 @@ "address_view": "Tignan ang address" }, "boost": { - "title": "Get Points", - "buy": "GET Points", + "title": "Magkaroon ng Points", + "buy": "KUMUHA ng Points", "next": "SUNOD", "account": { "title": "Kumuha ng Account Boost", @@ -488,7 +488,7 @@ } }, "free_estm": { - "title": "Free Points", + "title": "Libreng Points", "button": "IKUTIN & MANALO", "get_spin": "Limang(5) Ikot", "spin_right": "Ikot na natitira", @@ -527,10 +527,10 @@ "more_replies": "mas maraming tugon" }, "search_result": { - "others": "Others", + "others": "Iba Pa", "communities": { - "title": "Communities", - "subscribe": "Join", + "title": "Mga pamayanan", + "subscribe": "Sumali", "unsubscribe": "Leave", "subscribers": "Members", "posters": "Posters", From 8dc292878ccf9ccaa4c80eddb5ae7e6a9305e6f7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 20 Dec 2020 13:54:08 +0200 Subject: [PATCH 050/505] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index 9131b111f1..a4d367421b 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -35,8 +35,8 @@ "no_activity": "Walang aktibidad kamakailan", "outgoing_transfer_description": "", "incoming_transfer_description": "", - "post_desc": "Kikita ka ng puntos sa pamamagitan ng regular na pag-post. Ang pag-post ay nagbibigay sa iyo ng hanggang sa 15 na puntos.", - "comment_desc": "Ang bawat komento na ginagawa mo ay nakakatulong sa pagpapalago ng iyong madla at kumikita ka ng hanggang 5 na puntos.", + "post_desc": "Kikita ka ng puntos sa pamamagitan ng palaging pagpost. Ang pagpost ay magbibigay sa iyo ng hanggang sa 15 puntos.", + "comment_desc": "Ang bawat komento na ginagawa mo ay nakakatulong sa pagpaparami ng iyong madla at magbibigay sayo ng hanggang 5 puntos.", "checkin_desc": "Ang regular na pagsuri ay nagbibigay sa iyo ng 0.25 na puntos.", "vote_desc": "Sa pagboto, nagbibigay ka ng gantimpala sa mga tagalikha at nagbibigay naman sa iyo ng hanggang 0.01 x bigat ng boto na puntos.", "reblog_desc": "Ibahagi ang post na gusto mo sa iyong mga kaibigan at kikita ka ng puntos.", From b598a0a3d4604abd29c7791510fa3f91a0c245b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 20 Dec 2020 23:08:22 +0300 Subject: [PATCH 051/505] Disappear and show the fields in editorScreen --- .../view/selectCommunityAreStyles.js | 1 + .../markdownEditor/view/markdownEditorView.js | 6 +- .../textInput/view/textInputView.js | 3 +- src/screens/editor/screen/editorScreen.js | 108 +++++++++++++----- 4 files changed, 86 insertions(+), 32 deletions(-) diff --git a/src/components/editorElements/selectCommunityArea/view/selectCommunityAreStyles.js b/src/components/editorElements/selectCommunityArea/view/selectCommunityAreStyles.js index 201a847237..5b464f35dd 100644 --- a/src/components/editorElements/selectCommunityArea/view/selectCommunityAreStyles.js +++ b/src/components/editorElements/selectCommunityArea/view/selectCommunityAreStyles.js @@ -4,6 +4,7 @@ export default EStyleSheet.create({ selectCommunityAreaViewContainer: { alignItems: 'center', flexDirection: 'row', + paddingVertical: 4, }, chooseACommunityText: { marginHorizontal: 8, diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js index cb829f4be3..707bfd8a35 100644 --- a/src/components/markdownEditor/view/markdownEditorView.js +++ b/src/components/markdownEditor/view/markdownEditorView.js @@ -32,6 +32,8 @@ const MarkdownEditorView = ({ handleIsValid, componentID, uploadedImage, + onFocus, + onScrollToTop, }) => { const [text, setText] = useState(draftBody || ''); const [selection, setSelection] = useState({ start: 0, end: 0 }); @@ -226,7 +228,7 @@ const MarkdownEditorView = ({ )} diff --git a/src/components/textInput/view/textInputView.js b/src/components/textInput/view/textInputView.js index 1c699e329f..e8dca19194 100644 --- a/src/components/textInput/view/textInputView.js +++ b/src/components/textInput/view/textInputView.js @@ -6,7 +6,7 @@ import { ThemeContainer } from '../../../containers'; // Styles import styles from './textInputStyles'; -const TextInputView = ({ innerRef, height, style, ...props }) => ( +const TextInputView = ({ innerRef, height, style, onScrollToTop, ...props }) => ( {({ isDarkTheme }) => ( ( keyboardAppearance={isDarkTheme ? 'dark' : 'light'} {...props} style={[styles.input, { minHeight: height }, style]} + onScroll={(event) => event.nativeEvent.contentOffset.y <= 0 && onScrollToTop()} /> )} diff --git a/src/screens/editor/screen/editorScreen.js b/src/screens/editor/screen/editorScreen.js index ebe3c18f7e..02166c53f4 100644 --- a/src/screens/editor/screen/editorScreen.js +++ b/src/screens/editor/screen/editorScreen.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { View } from 'react-native'; +import { View, Animated } from 'react-native'; import { injectIntl } from 'react-intl'; import { get, isNull } from 'lodash'; @@ -52,6 +52,9 @@ class EditorScreen extends Component { }, isCommunitiesListModalOpen: false, selectedCommunity: null, + animatedViewHeight: new Animated.Value(150), + animatedViewOpacity: new Animated.Value(1), + showFields: true, }; } @@ -241,6 +244,40 @@ class EditorScreen extends Component { }); }; + _handleDisappearAnimatedContainer = () => { + const { animatedViewHeight, animatedViewOpacity } = this.state; + + Animated.timing(animatedViewHeight, { + toValue: 0, + duration: 1000, // <-- animation duration + useNativeDriver: false, // <-- need to set false to prevent yellow box warning + }).start(() => this.setState({ showFields: false })); + + Animated.timing(animatedViewOpacity, { + toValue: 0, + duration: 1000, // <-- animation duration + useNativeDriver: false, // <-- need to set false to prevent yellow box warning + }).start(); + }; + + _handleShowAnimatedContainer = () => { + const { animatedViewHeight, animatedViewOpacity } = this.state; + + this.setState({ showFields: true }); + + Animated.timing(animatedViewHeight, { + toValue: 150, + duration: 1000, // <-- animation duration + useNativeDriver: false, // <-- need to set false to prevent yellow box warning + }).start(); + + Animated.timing(animatedViewOpacity, { + toValue: 1, + duration: 1000, // <-- animation duration + useNativeDriver: false, // <-- need to set false to prevent yellow box warning + }).start(); + }; + render() { const { fields, @@ -250,6 +287,9 @@ class EditorScreen extends Component { isRemoveTag, isCommunitiesListModalOpen, selectedCommunity, + animatedViewHeight, + animatedViewOpacity, + showFields, } = this.state; const { handleOnImagePicker, @@ -311,35 +351,41 @@ class EditorScreen extends Component { isFormValid={isFormValid} isPreviewActive={isPreviewActive} > - {!isReply && !isEdit && ( - this.setState({ isCommunitiesListModalOpen: true })} - onPressIn={() => this.setState({ isCommunitiesListModalOpen: false })} - /> - )} - {isReply && !isEdit && } - {!isReply && } - {!isReply && !isPreviewActive && ( - this._getCommunity(hive)} - /> - )} - {!isReply && isPreviewActive && ( - 0 ? fields.tags : null} - componentID="tag-area" - intl={intl} - /> - )} + + {showFields && ( + <> + {!isReply && !isEdit && ( + this.setState({ isCommunitiesListModalOpen: true })} + onPressIn={() => this.setState({ isCommunitiesListModalOpen: false })} + /> + )} + {isReply && !isEdit && } + {!isReply && } + {!isReply && !isPreviewActive && ( + this._getCommunity(hive)} + /> + )} + {!isReply && isPreviewActive && ( + 0 ? fields.tags : null} + componentID="tag-area" + intl={intl} + /> + )} + + )} + From 2d3c12d524a344feca45bebe92787abfa17c7dcb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:22 +0200 Subject: [PATCH 052/505] New translations en-US.json (Bengali) --- src/config/locales/bn-BD.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/bn-BD.json b/src/config/locales/bn-BD.json index f920bd0ee1..d98b5f113c 100644 --- a/src/config/locales/bn-BD.json +++ b/src/config/locales/bn-BD.json @@ -320,9 +320,15 @@ "success_favorite": "পছন্দ যোগ হয়েছে", "success_unfavorite": "পছন্দ সরানো হয়েছে", "success_follow": "সাফল্য অনুসরণ করুন!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "নিঃশব্দ সাফল্য !", "success_unmute": "সাবলীল সাফল্য!", "success_unfollow": "সাফল্য অনুসরণ!", + "fail_unfollow": "Unfollow failed!", "warning": "সতর্কতা", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "নতুন পোস্ট", "community": "কমিউনিটি", "details": "বিস্তারিত" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From eb8dd14a92ea5b97b56d56568d82c5689a05c390 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:24 +0200 Subject: [PATCH 053/505] New translations en-US.json (Croatian) --- src/config/locales/hr-HR.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/hr-HR.json b/src/config/locales/hr-HR.json index b79a470c0f..81ea8f23b9 100644 --- a/src/config/locales/hr-HR.json +++ b/src/config/locales/hr-HR.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Upozorenje", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From bcfa360595e8bf466780278dc1f184663f775a7f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:26 +0200 Subject: [PATCH 054/505] New translations en-US.json (Malay) --- src/config/locales/ms-MY.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ms-MY.json b/src/config/locales/ms-MY.json index 91c0e47156..b57741cbe3 100644 --- a/src/config/locales/ms-MY.json +++ b/src/config/locales/ms-MY.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Amaran", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Adakah anda pasti ingin memadam?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "komuniti", "details": "Butir-butir" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 0681b2d676acf288939af649bbe8a3bc9a9e880f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:28 +0200 Subject: [PATCH 055/505] New translations en-US.json (Kyrgyz) --- src/config/locales/ky-KG.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ky-KG.json b/src/config/locales/ky-KG.json index 3d18fbff2b..f5dd1300ab 100644 --- a/src/config/locales/ky-KG.json +++ b/src/config/locales/ky-KG.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Көңүл бургула", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From fce4cbcb315c372e259b0f85ab90ff5824579372 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:30 +0200 Subject: [PATCH 056/505] New translations en-US.json (Azerbaijani) --- src/config/locales/az-AZ.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/az-AZ.json b/src/config/locales/az-AZ.json index 6d214fa69d..090f8d7b42 100644 --- a/src/config/locales/az-AZ.json +++ b/src/config/locales/az-AZ.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Xəbərdarlıq", "invalid_pincode": "Etibarsız PIN kod, zəhmət olmasa yoxlayıb yenidən sınayın.", "remove_alert": "Çıxarmaq istədiyinizə əminsiniz?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From e64a9fdf9765a3799fff4c804115fe8702b55f4b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:32 +0200 Subject: [PATCH 057/505] New translations en-US.json (Latvian) --- src/config/locales/lv-LV.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/lv-LV.json b/src/config/locales/lv-LV.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/lv-LV.json +++ b/src/config/locales/lv-LV.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 88efa3aa155682425def03158f121311975d3828 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:34 +0200 Subject: [PATCH 058/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 7fb33158e9..26579cfb50 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Hoiatus", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 44976e3ffafc32c83f6d33437120a3b640418464 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:36 +0200 Subject: [PATCH 059/505] New translations en-US.json (Kazakh) --- src/config/locales/kk-KZ.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/kk-KZ.json b/src/config/locales/kk-KZ.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/kk-KZ.json +++ b/src/config/locales/kk-KZ.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From dc8912205e7da62176227cef6a4b0b5bc06b74ce Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:38 +0200 Subject: [PATCH 060/505] New translations en-US.json (Thai) --- src/config/locales/th-TH.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/th-TH.json b/src/config/locales/th-TH.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/th-TH.json +++ b/src/config/locales/th-TH.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From c2dee6ee38c32f28b1a70e8bc282382943e85ca5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:40 +0200 Subject: [PATCH 061/505] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index a4d367421b..191ba0dccf 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -320,9 +320,15 @@ "success_favorite": "Paborito ay nadagdag!", "success_unfavorite": "Paborito ay natanggal!", "success_follow": "Nagtagumpay sa pagsunod!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Nagtagumpay sa pag-mute!", "success_unmute": "Nagtagumpay sa pag-unmute!", "success_unfollow": "Nagtagumpay sa hindi pagsunod!", + "fail_unfollow": "Unfollow failed!", "warning": "Babala", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 436ed107b975b18843ba48bc8dbcd6095d0f3127 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:41 +0200 Subject: [PATCH 062/505] New translations en-US.json (Tamil) --- src/config/locales/ta-IN.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ta-IN.json b/src/config/locales/ta-IN.json index d7a3528dae..4d996b26eb 100644 --- a/src/config/locales/ta-IN.json +++ b/src/config/locales/ta-IN.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From c8d685d989c05fa8c5694e8ac63c8842f67a3c12 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:43 +0200 Subject: [PATCH 063/505] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 6cadb22cb7..e8bb8bbb69 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "اخطار", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From f0d8470966c14b88918fa4420ee11586884e67f2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:46 +0200 Subject: [PATCH 064/505] New translations en-US.json (Indonesian) --- src/config/locales/id-ID.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/id-ID.json b/src/config/locales/id-ID.json index ff8bff0dc6..edd3ada6aa 100644 --- a/src/config/locales/id-ID.json +++ b/src/config/locales/id-ID.json @@ -320,9 +320,15 @@ "success_favorite": "Favorit ditambahkan!", "success_unfavorite": "Favorit dihapus!", "success_follow": "Ikuti kesuksesan!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Bisukan kesuksesan!", "success_unmute": "Suarakan kesuksesan!", "success_unfollow": "Berhenti mengikuti kesuksesan!", + "fail_unfollow": "Unfollow failed!", "warning": "Peringatan", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Yakin ingin menghapus?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From ec7e8112c6a4ffe1bc8a853dd4a86328ec5fb97d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:47 +0200 Subject: [PATCH 065/505] New translations en-US.json (Icelandic) --- src/config/locales/is-IS.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/is-IS.json b/src/config/locales/is-IS.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/is-IS.json +++ b/src/config/locales/is-IS.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 890fe4f4e7c6944b1ca2aafc9a8ab5c7aadb859a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:49 +0200 Subject: [PATCH 066/505] New translations en-US.json (Galician) --- src/config/locales/gl-ES.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/gl-ES.json b/src/config/locales/gl-ES.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/gl-ES.json +++ b/src/config/locales/gl-ES.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From d002d4005e5b943f866bfa57a53683cb86dc26e1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:51 +0200 Subject: [PATCH 067/505] New translations en-US.json (Vietnamese) --- src/config/locales/vi-VN.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/vi-VN.json b/src/config/locales/vi-VN.json index c691e261a3..be9012a873 100644 --- a/src/config/locales/vi-VN.json +++ b/src/config/locales/vi-VN.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Cảnh báo", "invalid_pincode": "Mã PIN không hợp lệ, vui lòng kiểm tra và thử lại.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 845211749d87bd47fd8b18537dfb743304d98e70 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:53 +0200 Subject: [PATCH 068/505] New translations en-US.json (Esperanto) --- src/config/locales/eo-UY.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/eo-UY.json b/src/config/locales/eo-UY.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/eo-UY.json +++ b/src/config/locales/eo-UY.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From afc133f50c80c5f49f355495633e4f6dfd8d58bb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:55 +0200 Subject: [PATCH 069/505] New translations en-US.json (Tibetan) --- src/config/locales/bo-BT.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/bo-BT.json b/src/config/locales/bo-BT.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/bo-BT.json +++ b/src/config/locales/bo-BT.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 8fba57d65d16f0c0249f0934183134cab3956ded Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:57 +0200 Subject: [PATCH 070/505] New translations en-US.json (Chinese Traditional) --- src/config/locales/zh-TW.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/zh-TW.json b/src/config/locales/zh-TW.json index 989ffc88e3..e4629ce76a 100644 --- a/src/config/locales/zh-TW.json +++ b/src/config/locales/zh-TW.json @@ -320,9 +320,15 @@ "success_favorite": "已添加我的最愛", "success_unfavorite": "取消收藏", "success_follow": "關注成功！", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "遮罩成功！", "success_unmute": "遮罩取消成功", "success_unfollow": "取消關注成功！", + "fail_unfollow": "Unfollow failed!", "warning": "警告", "invalid_pincode": "無效的PIN碼，請核對後再試一次。", "remove_alert": "確定要刪除嗎？", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 4a66cca1b4311b4e3faf3d3f4afa8d42b975c69b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:53:58 +0200 Subject: [PATCH 071/505] New translations en-US.json (Kashmiri) --- src/config/locales/ks-IN.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ks-IN.json b/src/config/locales/ks-IN.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/ks-IN.json +++ b/src/config/locales/ks-IN.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 8334d38432c9dfd6acb52c2018a12bec15b51ad0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:00 +0200 Subject: [PATCH 072/505] New translations en-US.json (Urdu (India)) --- src/config/locales/ur-IN.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ur-IN.json b/src/config/locales/ur-IN.json index 08437b7f48..937e2797ae 100644 --- a/src/config/locales/ur-IN.json +++ b/src/config/locales/ur-IN.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid PIN code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 34cf6ac45257cc0b9181dc474e3bcad2a299471c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:02 +0200 Subject: [PATCH 073/505] New translations en-US.json (Kabyle) --- src/config/locales/kab-KAB.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/kab-KAB.json b/src/config/locales/kab-KAB.json index 26abad50eb..ea7e956bbd 100644 --- a/src/config/locales/kab-KAB.json +++ b/src/config/locales/kab-KAB.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Ɣur-k", "invalid_pincode": "Tangalt PIN mačči d tameɣtut, sefqed tɛerḍeḍ tikelt-nniḍen.", "remove_alert": "Tebɣiḍ s tidet tukksa?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 89617479bd6e2bec0dbfc45e7c7f42b697da60e2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:04 +0200 Subject: [PATCH 074/505] New translations en-US.json (Gothic) --- src/config/locales/got-DE.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/got-DE.json b/src/config/locales/got-DE.json index 83bd85a9a0..04fc49206a 100644 --- a/src/config/locales/got-DE.json +++ b/src/config/locales/got-DE.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Ungaraihts pin kodus, bidjam þuk sai jah sokei aftra.", "remove_alert": "Bi sunjai wileis þata usniman?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 6b3eb51a46d67b5dcf22a0f57fc5f41cf7961cf7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:06 +0200 Subject: [PATCH 075/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 64d59dd710..7605234674 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -320,9 +320,15 @@ "success_favorite": "We don add wetin u like!", "success_unfavorite": "We don comot wetin u like!", "success_follow": "Ur follow don confam!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "We don confam say u no wan hear from am again!", "success_unmute": "You wan dey hear from am don confam!", "success_unfollow": "U no follow again don confam!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Your PIN code no correct, abeg check wella and try am again", "remove_alert": "You sure say you wan remove am?", @@ -556,5 +562,9 @@ "new_post": "Post wey new", "community": "area", "details": "Full informate" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From e3a94161920c8accbab93740d83031ba160e9e2f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:08 +0200 Subject: [PATCH 076/505] New translations en-US.json (Sanskrit) --- src/config/locales/sa-IN.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/sa-IN.json b/src/config/locales/sa-IN.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/sa-IN.json +++ b/src/config/locales/sa-IN.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From dd4a06c20016c0dde99373aa3952f4415de6d66f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:10 +0200 Subject: [PATCH 077/505] New translations en-US.json (Turkmen) --- src/config/locales/tk-TM.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/tk-TM.json b/src/config/locales/tk-TM.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/tk-TM.json +++ b/src/config/locales/tk-TM.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 0e4b7cb87f84d089b3f4a04fe2aac0e23f2c47ab Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:12 +0200 Subject: [PATCH 078/505] New translations en-US.json (Cebuano) --- src/config/locales/ceb-PH.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ceb-PH.json b/src/config/locales/ceb-PH.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/ceb-PH.json +++ b/src/config/locales/ceb-PH.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From bb23b540782b90ee39f07466d0646081aeb71f95 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:14 +0200 Subject: [PATCH 079/505] New translations en-US.json (Bosnian) --- src/config/locales/bs-BA.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/bs-BA.json b/src/config/locales/bs-BA.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/bs-BA.json +++ b/src/config/locales/bs-BA.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From c12caad2f4ed52217c27a494c25256065180fdb4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:16 +0200 Subject: [PATCH 080/505] New translations en-US.json (Yoruba) --- src/config/locales/yo-NG.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/yo-NG.json b/src/config/locales/yo-NG.json index b8a7e94e4a..73b10b1660 100644 --- a/src/config/locales/yo-NG.json +++ b/src/config/locales/yo-NG.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Ìkìlọ", "invalid_pincode": "PIN yi o se tewogba, jowo sematuyewo, ki o tun te.", "remove_alert": "Se o da o loju pe ofe yo kuro?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From dd9c1cca031601362b32cadfab2022dfc9532d11 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:18 +0200 Subject: [PATCH 081/505] New translations en-US.json (Tajik) --- src/config/locales/tg-TJ.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/tg-TJ.json b/src/config/locales/tg-TJ.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/tg-TJ.json +++ b/src/config/locales/tg-TJ.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From c41c89f7744f0afb9836f74932d827f9bc3de1de Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:20 +0200 Subject: [PATCH 082/505] New translations en-US.json (Nepali) --- src/config/locales/ne-NP.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ne-NP.json b/src/config/locales/ne-NP.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/ne-NP.json +++ b/src/config/locales/ne-NP.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 9a865e80271ee4a393a61dd4d110b7cb9aba98ab Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:21 +0200 Subject: [PATCH 083/505] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index 1368b1165a..60751c229f 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -320,9 +320,15 @@ "success_favorite": "Favorit je dodat!", "success_unfavorite": "Favorit je uklonjen!", "success_follow": "Uspešno praćenje!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Isključivanje notifikacija uspešno!", "success_unmute": "Uključivanje notifikacija uspešno!", "success_unfollow": "Prestanak praćenja uspešan!", + "fail_unfollow": "Unfollow failed!", "warning": "Upozorenje", "invalid_pincode": "Nevažeći PIN kod, molimo proverite i pokušajte ponovo.", "remove_alert": "Da li ste sigurni da želite da uklonite?", @@ -556,5 +562,9 @@ "new_post": "Nova objava", "community": "zajednica", "details": "Detalji" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 29f4b9800d5c9631758cb6282665daae488866bb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:23 +0200 Subject: [PATCH 084/505] New translations en-US.json (Swahili) --- src/config/locales/sw-KE.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/sw-KE.json b/src/config/locales/sw-KE.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/sw-KE.json +++ b/src/config/locales/sw-KE.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From fae2ed366745ea761dadf4d896baf60ee2a4e6fe Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:25 +0200 Subject: [PATCH 085/505] New translations en-US.json (Assamese) --- src/config/locales/as-IN.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/as-IN.json b/src/config/locales/as-IN.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/as-IN.json +++ b/src/config/locales/as-IN.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From bc5119c4663aa39b213f907d7de5eaf8d65a25d8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:27 +0200 Subject: [PATCH 086/505] New translations en-US.json (Uzbek) --- src/config/locales/uz-UZ.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/uz-UZ.json b/src/config/locales/uz-UZ.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/uz-UZ.json +++ b/src/config/locales/uz-UZ.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From cf4b36d1787762a197216ccd8dedda9e883e96c2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:29 +0200 Subject: [PATCH 087/505] New translations en-US.json (Urdu (Pakistan)) --- src/config/locales/ur-PK.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ur-PK.json b/src/config/locales/ur-PK.json index 08437b7f48..937e2797ae 100644 --- a/src/config/locales/ur-PK.json +++ b/src/config/locales/ur-PK.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid PIN code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 8d83dd7bb96ab146f34f2be41850db95beec5b4e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:31 +0200 Subject: [PATCH 088/505] New translations en-US.json (Chinese Simplified) --- src/config/locales/zh-CN.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/zh-CN.json b/src/config/locales/zh-CN.json index bce199d1a6..db79776198 100644 --- a/src/config/locales/zh-CN.json +++ b/src/config/locales/zh-CN.json @@ -320,9 +320,15 @@ "success_favorite": "已添加收藏夹", "success_unfavorite": "取消收藏", "success_follow": "关注成功！", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "屏蔽成功！", "success_unmute": "屏蔽取消成功", "success_unfollow": "取消关注成功！", + "fail_unfollow": "Unfollow failed!", "warning": "警告", "invalid_pincode": "无效的 PIN 码，请检查并重试。", "remove_alert": "您确定想要移除？", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From af6b209e42f24058f07c457dbcd6b4532edb3aea Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:33 +0200 Subject: [PATCH 089/505] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index 4e3a6dccd1..b41b497e7c 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -320,9 +320,15 @@ "success_favorite": "पसंदीदा जोड़ा!", "success_unfavorite": "पसंदीदा हटा दिया गया!", "success_follow": "सफलता का पालन करें!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "सफलता को म्यूट करें!", "success_unmute": "सफलता को बेपर्दा करो!", "success_unfollow": "असफल सफलता!", + "fail_unfollow": "Unfollow failed!", "warning": "चेतावनी", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "क्या आप इसे सच में हटाना चाहते हैं?", @@ -556,5 +562,9 @@ "new_post": "नया पोस्ट", "community": "समुदाय", "details": "विवरण" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From dfb32c7f5e78db15e36f8f0f6d465929910f277f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:35 +0200 Subject: [PATCH 090/505] New translations en-US.json (German) --- src/config/locales/de-DE.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 477f763d0a..dd4bdb6291 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warnung", "invalid_pincode": "Ungültiger PIN-Code, bitte überprüfen und erneut versuchen.", "remove_alert": "Bist du sicher, dass du es entfernen möchtest?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From ceeb38d2f8c6abe5212ffeeadfdc2026f11cbbb4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:37 +0200 Subject: [PATCH 091/505] New translations en-US.json (Armenian) --- src/config/locales/hy-AM.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/hy-AM.json b/src/config/locales/hy-AM.json index 0b2851943e..21d34dc4b4 100644 --- a/src/config/locales/hy-AM.json +++ b/src/config/locales/hy-AM.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 5c384a153a0c57313e55f1e33399f519a0d52ca9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:39 +0200 Subject: [PATCH 092/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 55f5be64d6..2a024dc84f 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -320,9 +320,15 @@ "success_favorite": "Kedvencekhez hozzáadva!", "success_unfavorite": "Kedvencektől eltávolítva!", "success_follow": "Sikeres követés!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Sikeres némítás!", "success_unmute": "Némítás sikeres feloldása!", "success_unfollow": "Követés sikeres visszavonása!", + "fail_unfollow": "Unfollow failed!", "warning": "Figyelmeztetés", "invalid_pincode": "Érvénytelen PIN kód, kérjük ellenőrizd és próbáld újra.", "remove_alert": "Biztos, hogy törölni akarod?", @@ -556,5 +562,9 @@ "new_post": "Új bejegyzés", "community": "közösség", "details": "Részletek" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 3fa1b52bd642d45360a140de09fb9c0b6b6c636b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:41 +0200 Subject: [PATCH 093/505] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index 031fcd3865..e830223dcd 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "אזהרה", "invalid_pincode": "קוד PIN לא תקין, אנא בדוק ונסה שנית.", "remove_alert": "האם בוודאות ברצונך להסיר?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 75ff0065a3381b0f272ab85e2ca8dffc9f689839 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:43 +0200 Subject: [PATCH 094/505] New translations en-US.json (Irish) --- src/config/locales/ga-IE.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ga-IE.json b/src/config/locales/ga-IE.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/ga-IE.json +++ b/src/config/locales/ga-IE.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 3a9449f0c53408bd438bfa45bd7a7a690b58088d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:45 +0200 Subject: [PATCH 095/505] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index 8eb18fb8b0..9401686da5 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -320,9 +320,15 @@ "success_favorite": "Suosikki lisätty!", "success_unfavorite": "Suosikki poistettu!", "success_follow": "Seuraaminen onnistui!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Hiljentäminen onnistui!", "success_unmute": "Hiljennyksen poisto onnistui!", "success_unfollow": "Seuraamisen lopettaminen onnistui!", + "fail_unfollow": "Unfollow failed!", "warning": "Varoitus", "invalid_pincode": "Virheellinen PIN-koodi, tarkista koodi ja yritä uudelleen.", "remove_alert": "Haluatko varmasti poistaa?", @@ -556,5 +562,9 @@ "new_post": "Uusi julkaisu", "community": "yhteisö", "details": "Lisätiedot" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From fec760525568fb87876a0093726f6ee6a3da3c10 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:47 +0200 Subject: [PATCH 096/505] New translations en-US.json (Greek) --- src/config/locales/el-GR.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/el-GR.json b/src/config/locales/el-GR.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/el-GR.json +++ b/src/config/locales/el-GR.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 7cf5d65f5cfd38bebc882244ba11143ba30bfb8e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:48 +0200 Subject: [PATCH 097/505] New translations en-US.json (Danish) --- src/config/locales/da-DK.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/da-DK.json b/src/config/locales/da-DK.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/da-DK.json +++ b/src/config/locales/da-DK.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 1867c65f81d60e7c7017e383f4a3f1fbda73e68b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:50 +0200 Subject: [PATCH 098/505] New translations en-US.json (Japanese) --- src/config/locales/ja-JP.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ja-JP.json b/src/config/locales/ja-JP.json index d0da90a84a..db917a6816 100644 --- a/src/config/locales/ja-JP.json +++ b/src/config/locales/ja-JP.json @@ -320,9 +320,15 @@ "success_favorite": "お気に入りに追加しました！", "success_unfavorite": "お気に入りから削除しました！", "success_follow": "フォロー成功！", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "ミュート成功！", "success_unmute": "ミュート解除成功！", "success_unfollow": "フォロー解除成功！", + "fail_unfollow": "Unfollow failed!", "warning": "警告", "invalid_pincode": "PINコードが間違っています。もう一度確認してやり直してください。", "remove_alert": "本当に削除しますか？", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 2cd0af602f3e8b0489f327678d342777faf64362 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:52 +0200 Subject: [PATCH 099/505] New translations en-US.json (Czech) --- src/config/locales/cs-CZ.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/cs-CZ.json b/src/config/locales/cs-CZ.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/cs-CZ.json +++ b/src/config/locales/cs-CZ.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From ee863dcbb99d7841783a60c3ea56f27b48246bfd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:54 +0200 Subject: [PATCH 100/505] New translations en-US.json (Catalan) --- src/config/locales/ca-ES.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ca-ES.json b/src/config/locales/ca-ES.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/ca-ES.json +++ b/src/config/locales/ca-ES.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 8def9ba52fbb02fd6393f5018a01204d193b5bb6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:56 +0200 Subject: [PATCH 101/505] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 7f85456a0b..572cfceedd 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -320,9 +320,15 @@ "success_favorite": "Добавено в любими!", "success_unfavorite": "Прамахнат от любими!", "success_follow": "Последван успешно!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Заглушаване успешно!", "success_unmute": "Заглушаване премахнато успешно!", "success_unfollow": "Отказ от следване!", + "fail_unfollow": "Unfollow failed!", "warning": "Внимание", "invalid_pincode": "Невалиден Пин-код,провери и опитай отново.", "remove_alert": "Сигорни ли сте за премахването?", @@ -556,5 +562,9 @@ "new_post": "Нова публикация", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From c0a8121de6e6b94bc1bc991d755d644a225b75a2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:54:58 +0200 Subject: [PATCH 102/505] New translations en-US.json (Arabic) --- src/config/locales/ar-SA.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json index 0d46ced1d3..2e254ec5b8 100644 --- a/src/config/locales/ar-SA.json +++ b/src/config/locales/ar-SA.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "تحذير", "invalid_pincode": "الرقم السري غير صالح، يرجى التحقق والمحاولة مرة أخرى.", "remove_alert": "هل أنت متأكد تريد الإزالة؟", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From f50762a0117361c338e6c5438b76dc2ba8bb8c58 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:00 +0200 Subject: [PATCH 103/505] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index 04679e52be..bfdcbe5061 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -320,9 +320,15 @@ "success_favorite": "Añadido a favoritos!", "success_unfavorite": "Post removido de favoritos!", "success_follow": "Ahora le sigues!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Muteo exitoso!", "success_unmute": "¡Muteo exitoso!", "success_unfollow": "¡Dejar de seguir con éxito!", + "fail_unfollow": "Unfollow failed!", "warning": "Advertencia", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Está seguro que quiere borrar?", @@ -556,5 +562,9 @@ "new_post": "Escribir un post", "community": "comunidad", "details": "Detalles" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From fa2cdceee4df0b883e165e96fd6f8a9669b870f8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:02 +0200 Subject: [PATCH 104/505] New translations en-US.json (Romanian) --- src/config/locales/ro-RO.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ro-RO.json b/src/config/locales/ro-RO.json index 30a0857879..6f3fb5d79f 100644 --- a/src/config/locales/ro-RO.json +++ b/src/config/locales/ro-RO.json @@ -320,9 +320,15 @@ "success_favorite": "Adăugat la favorite!", "success_unfavorite": "Șters de la favorit!", "success_follow": "Urmărește succesul!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Setează succesul pe silențios!", "success_unmute": "Anulează modul silențios al succesului!", "success_unfollow": "Nu mai urmări succesul!", + "fail_unfollow": "Unfollow failed!", "warning": "Atenționare", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Esti sigur că vrei să ștergi?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 394f8d8bc29fff1b23b72f650cd5cd69066a6027 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:04 +0200 Subject: [PATCH 105/505] New translations en-US.json (French) --- src/config/locales/fr-FR.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/fr-FR.json b/src/config/locales/fr-FR.json index 4ae3142db1..c2ab283489 100644 --- a/src/config/locales/fr-FR.json +++ b/src/config/locales/fr-FR.json @@ -320,9 +320,15 @@ "success_favorite": "Favori ajouté !", "success_unfavorite": "Favori supprimé !", "success_follow": "Suivi avec succès !", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Rendu muet avec succès !", "success_unmute": "Rendu non muet avec succès !", "success_unfollow": "Désabonné avec succès !", + "fail_unfollow": "Unfollow failed!", "warning": "Attention", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Êtes-vous sûr de vouloir retirer ?", @@ -556,5 +562,9 @@ "new_post": "Nouvelle Publication", "community": "communauté", "details": "Détails" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 4489b6b8c61a6797cf344284e6542245ba1ccf0d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:06 +0200 Subject: [PATCH 106/505] New translations en-US.json (Italian) --- src/config/locales/it-IT.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/it-IT.json b/src/config/locales/it-IT.json index ff347a95ad..a0275316c8 100644 --- a/src/config/locales/it-IT.json +++ b/src/config/locales/it-IT.json @@ -320,9 +320,15 @@ "success_favorite": "Preferito aggiunto!", "success_unfavorite": "Preferito rimosso!", "success_follow": "Seguito con successo!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Silenziato con successo!", "success_unmute": "Riattivazione riuscita!", "success_unfollow": "Non segui più!", + "fail_unfollow": "Unfollow failed!", "warning": "Attenzione", "invalid_pincode": "Codice PIN non valido, si prega di verificare e riprovare.", "remove_alert": "Sei sicuro di volerlo rimuovere?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From f2a7b5f3f67d56e8e9900da38bba3c1692a84fe1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:08 +0200 Subject: [PATCH 107/505] New translations en-US.json (Georgian) --- src/config/locales/ka-GE.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ka-GE.json b/src/config/locales/ka-GE.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/ka-GE.json +++ b/src/config/locales/ka-GE.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 6bd469aed03b30c81939d33997e73888224de52e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:10 +0200 Subject: [PATCH 108/505] New translations en-US.json (Ukrainian) --- src/config/locales/uk-UA.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/uk-UA.json b/src/config/locales/uk-UA.json index dae178d942..9a93c1471e 100644 --- a/src/config/locales/uk-UA.json +++ b/src/config/locales/uk-UA.json @@ -320,9 +320,15 @@ "success_favorite": "До улюблених додано!", "success_unfavorite": "З улюблених видалено!", "success_follow": "Успішно підписалися!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Успішно почали ігнорувати!", "success_unmute": "Успішно припинили ігнорувати!", "success_unfollow": "Успішно відписалися!", + "fail_unfollow": "Unfollow failed!", "warning": "Увага", "invalid_pincode": "Невірний пін-код. Будь ласка, перевірте і повторіть спробу.", "remove_alert": "Ви дійсно бажаєте видалити?", @@ -556,5 +562,9 @@ "new_post": "Новий допис", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 09a17624ee9b46b6e9ecffc6e9dfc44750b8a55a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:12 +0200 Subject: [PATCH 109/505] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index c8b844af49..f3cc2dfe37 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -320,9 +320,15 @@ "success_favorite": "Favorito adicionado!", "success_unfavorite": "Favorito removido!", "success_follow": "Seguido com sucesso!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Silenciado com sucesso!", "success_unmute": "Mudo desativado com sucesso!", "success_unfollow": "Deixou de seguir com sucesso!", + "fail_unfollow": "Unfollow failed!", "warning": "Aviso", "invalid_pincode": "Código PIN inválido, por favor verifique e tente novamente.", "remove_alert": "Tem a certeza de que pretende remover?", @@ -556,5 +562,9 @@ "new_post": "Nova Postagem", "community": "comunidade", "details": "Detalhes" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From f5f3687908c54b57e4b654c71369d6e9b7c6e2f4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:14 +0200 Subject: [PATCH 110/505] New translations en-US.json (Turkish) --- src/config/locales/tr-TR.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/tr-TR.json b/src/config/locales/tr-TR.json index 1b56b469c3..3508021dd6 100644 --- a/src/config/locales/tr-TR.json +++ b/src/config/locales/tr-TR.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Uyarı", "invalid_pincode": "Geçersiz pin gözden geçirip yeniden deneyin.", "remove_alert": "Kaldırmak istediğine emin misin ?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 39d2a51b4825ce8ad5bcdfaca89d03e467d75c97 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:16 +0200 Subject: [PATCH 111/505] New translations en-US.json (Swedish) --- src/config/locales/sv-SE.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/sv-SE.json b/src/config/locales/sv-SE.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/sv-SE.json +++ b/src/config/locales/sv-SE.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From a57464e86a2dfd22fb200dbdbf02db345fdde24d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:18 +0200 Subject: [PATCH 112/505] New translations en-US.json (Albanian) --- src/config/locales/sq-AL.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/sq-AL.json b/src/config/locales/sq-AL.json index 0b2851943e..21d34dc4b4 100644 --- a/src/config/locales/sq-AL.json +++ b/src/config/locales/sq-AL.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 9e0456969874c20d9b92109a64201167c5471121 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:19 +0200 Subject: [PATCH 113/505] New translations en-US.json (Slovenian) --- src/config/locales/sl-SI.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/sl-SI.json b/src/config/locales/sl-SI.json index 11a0af938a..0588df49c3 100644 --- a/src/config/locales/sl-SI.json +++ b/src/config/locales/sl-SI.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From a5d952bb9c8051a58937a046e3beb6b3e85159ab Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:22 +0200 Subject: [PATCH 114/505] New translations en-US.json (Slovak) --- src/config/locales/sk-SK.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/sk-SK.json b/src/config/locales/sk-SK.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/sk-SK.json +++ b/src/config/locales/sk-SK.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 7deb06956c5e4bcd518744781c24d68c60f04063 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:24 +0200 Subject: [PATCH 115/505] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index 212ee463bb..f1475f926b 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -320,9 +320,15 @@ "success_favorite": "Добавлено в Избранное!", "success_unfavorite": "Удалено из Избранного!", "success_follow": "Успешная подписка!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Успешно игнорируется!", "success_unmute": "Успешно перестали игнорировать!", "success_unfollow": "Успешная отписка!", + "fail_unfollow": "Unfollow failed!", "warning": "Внимание", "invalid_pincode": "Неверный пин-код. Пожалуйста, проверьте и попробуйте еще раз.", "remove_alert": "Вы уверены, что хотите удалить?", @@ -556,5 +562,9 @@ "new_post": "Новый пост", "community": "сообщество", "details": "Подробности" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 653ee7f3dff113312b4e5fb2cbc1907e39c85447 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:26 +0200 Subject: [PATCH 116/505] New translations en-US.json (Polish) --- src/config/locales/pl-PL.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/pl-PL.json b/src/config/locales/pl-PL.json index 8d5a77290a..784d5a504f 100644 --- a/src/config/locales/pl-PL.json +++ b/src/config/locales/pl-PL.json @@ -320,9 +320,15 @@ "success_favorite": "Ulubione dodane!", "success_unfavorite": "Usuń z ulubionych!", "success_follow": "Podążaj za sukcesem!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Wyciszono pomyślnie!", "success_unmute": "Wyłącz wyciszenie!", "success_unfollow": "Przestań obserwować pomyślnie!", + "fail_unfollow": "Unfollow failed!", "warning": "Ostrzeżenie", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "Nowy wpis", "community": "społeczność", "details": "Szczegóły" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From dffacab27ad8015b0c7c1a475c3d2437fb63836c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:28 +0200 Subject: [PATCH 117/505] New translations en-US.json (Korean) --- src/config/locales/ko-KR.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ko-KR.json b/src/config/locales/ko-KR.json index 8eec407ddb..4c29e91e71 100644 --- a/src/config/locales/ko-KR.json +++ b/src/config/locales/ko-KR.json @@ -320,9 +320,15 @@ "success_favorite": "즐겨찾기가 추가되었습니다.", "success_unfavorite": "즐겨찾기가 제거되었습니다.", "success_follow": "팔로우하였습니다.", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "차단하였습니다.", "success_unmute": "차단을 해제하였습니다.", "success_unfollow": "팔로우를 취소하였습니다.", + "fail_unfollow": "Unfollow failed!", "warning": "경고", "invalid_pincode": "올바르지 않은 PIN 코드입니다. 확인 후 다시 시도해주세요.", "remove_alert": "정말 삭제하시겠습니까?", @@ -556,5 +562,9 @@ "new_post": "새 글", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 976af72a080b422dd1812567aba48c3ca72d9762 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:30 +0200 Subject: [PATCH 118/505] New translations en-US.json (Punjabi) --- src/config/locales/pa-IN.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/pa-IN.json b/src/config/locales/pa-IN.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/pa-IN.json +++ b/src/config/locales/pa-IN.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 4d9e9f8ec84197fa021fd19e9624106acf40b8b2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:32 +0200 Subject: [PATCH 119/505] New translations en-US.json (Norwegian) --- src/config/locales/no-NO.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/no-NO.json b/src/config/locales/no-NO.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/no-NO.json +++ b/src/config/locales/no-NO.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From dea464ad3cca8249ed6a131b1c39b08b014a20f5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:34 +0200 Subject: [PATCH 120/505] New translations en-US.json (Dutch) --- src/config/locales/nl-NL.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/nl-NL.json b/src/config/locales/nl-NL.json index 9754ad4be3..db0041b95e 100644 --- a/src/config/locales/nl-NL.json +++ b/src/config/locales/nl-NL.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Waarschuwing", "invalid_pincode": "Ongeldige PIN-code, controleer en probeer het opnieuw.", "remove_alert": "Weet je zeker dat je wilt verwijderen?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From ad607792a1fd1f45aca59fb59b403f87bf17dcef Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:36 +0200 Subject: [PATCH 121/505] New translations en-US.json (Mongolian) --- src/config/locales/mn-MN.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/mn-MN.json b/src/config/locales/mn-MN.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/mn-MN.json +++ b/src/config/locales/mn-MN.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From c9bae0d6ca4d9fc498f8cba2d1f20541635ce967 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:38 +0200 Subject: [PATCH 122/505] New translations en-US.json (Macedonian) --- src/config/locales/mk-MK.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/mk-MK.json b/src/config/locales/mk-MK.json index fe11a84945..4c4740fae8 100644 --- a/src/config/locales/mk-MK.json +++ b/src/config/locales/mk-MK.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 6467525fed1b50ca1ea6730b8a2b405e571d9d48 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:40 +0200 Subject: [PATCH 123/505] New translations en-US.json (Lithuanian) --- src/config/locales/lt-LT.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/lt-LT.json b/src/config/locales/lt-LT.json index 7c57dce3d8..a7ebfbd492 100644 --- a/src/config/locales/lt-LT.json +++ b/src/config/locales/lt-LT.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Dėmesio", "invalid_pincode": "Neteisingas PIN kodas, prašome patikrinti ir bandyti dar kartą.", "remove_alert": "Are you sure want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From e1dec4be359da976ecfcc0e4fedce1f187ce099a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:42 +0200 Subject: [PATCH 124/505] New translations en-US.json (Kurdish) --- src/config/locales/ku-TR.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ku-TR.json b/src/config/locales/ku-TR.json index 1ee1ce520f..2fbd4a37cd 100644 --- a/src/config/locales/ku-TR.json +++ b/src/config/locales/ku-TR.json @@ -320,9 +320,15 @@ "success_favorite": "Bijarde hate tevlîkirin!", "success_unfavorite": "Bijarde hate rakirin!", "success_follow": "Hate şopandin!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Hate bêdengkirin!", "success_unmute": "Ji bêdengbûnê hate derxistin!", "success_unfollow": "Ji şopê hate derketin!", + "fail_unfollow": "Unfollow failed!", "warning": "Hişyarî", "invalid_pincode": "Pînkod nederbasdar e, kontrol bike û dîsa biceribîne.", "remove_alert": "Bi rastî jî tu dixwazî rake?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From fe68e545f59d4780253f70325652fa3513b084cd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:55:44 +0200 Subject: [PATCH 125/505] New translations en-US.json (Acehnese) --- src/config/locales/ac-ace.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/ac-ace.json b/src/config/locales/ac-ace.json index f3552b63a7..ee417d2ede 100644 --- a/src/config/locales/ac-ace.json +++ b/src/config/locales/ac-ace.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Pëuingat", "invalid_pincode": "Salah pin, cie neu test loëm.", "remove_alert": "Peu yakin neuk sampóh?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 11ba72186c97cc39ea71bea41c7a32ce7ff1b4a5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 10:59:01 +0200 Subject: [PATCH 126/505] Update source file en-US.json --- src/config/locales/en-US.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 2c0413f07f..81d4f0ef68 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -320,9 +320,15 @@ "success_favorite": "Favorite added!", "success_unfavorite": "Favorite removed!", "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", "success_mute": "Mute success!", "success_unmute": "Unmute success!", "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", "warning": "Warning", "invalid_pincode": "Invalid PIN code, please check and try again.", "remove_alert": "Are you sure you want to remove?", @@ -556,5 +562,9 @@ "new_post": "New Post", "community": "community", "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" } } From 5255299076dee72f4ff8f903ae192e680f75474b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 11:59:14 +0200 Subject: [PATCH 127/505] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index 9401686da5..ad738db675 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -320,15 +320,15 @@ "success_favorite": "Suosikki lisätty!", "success_unfavorite": "Suosikki poistettu!", "success_follow": "Seuraaminen onnistui!", - "fail_follow": "Follow failed!", - "success_subscribe": "Subscribe success!", - "fail_subscribe": "Subscribe failed!", - "success_leave": "Leave success!", - "fail_leave": "Leave failed!", + "fail_follow": "Seuraaminen epäonnistui!", + "success_subscribe": "Tilaus onnistui!", + "fail_subscribe": "Tilaus epäonnistui!", + "success_leave": "Poistuminen onnistui!", + "fail_leave": "Poistuminen epäonnistui!", "success_mute": "Hiljentäminen onnistui!", "success_unmute": "Hiljennyksen poisto onnistui!", "success_unfollow": "Seuraamisen lopettaminen onnistui!", - "fail_unfollow": "Unfollow failed!", + "fail_unfollow": "Seuraamisen peruminen epäonnistui!", "warning": "Varoitus", "invalid_pincode": "Virheellinen PIN-koodi, tarkista koodi ja yritä uudelleen.", "remove_alert": "Haluatko varmasti poistaa?", From ecab13e345833247c5b6bae6cbd9ec19b737862d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 12:15:07 +0200 Subject: [PATCH 128/505] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index ad738db675..ccc5d658ae 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -564,7 +564,7 @@ "details": "Lisätiedot" }, "user": { - "follow": "Follow", - "unfollow": "Unfollow" + "follow": "Seuraa", + "unfollow": "Älä seuraa" } } From 21d45a8db4c0fad8c652e2a01e63cde63bb09bbe Mon Sep 17 00:00:00 2001 From: feruzm Date: Mon, 21 Dec 2020 12:29:11 +0200 Subject: [PATCH 129/505] podlock fix --- ios/Podfile.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 3e9a9c0ca3..e58eed3672 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -708,5 +708,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 1f30c7da5061dbc47185442a6ab4a3c95ac48c04 - -COCOAPODS: 1.10.0 \ No newline at end of file +COCOAPODS: 1.10.0 From 028c56d654af6d5e9c04cda105de9c02df5a40fb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 21 Dec 2020 12:46:58 +0200 Subject: [PATCH 130/505] New translations en-US.json (Indonesian) --- src/config/locales/id-ID.json | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/config/locales/id-ID.json b/src/config/locales/id-ID.json index edd3ada6aa..7ae4417c0a 100644 --- a/src/config/locales/id-ID.json +++ b/src/config/locales/id-ID.json @@ -21,7 +21,7 @@ "delegation": "Delegasi", "delegations": "Delegasi", "delegation_title": "Hadiah delegasi", - "delegation_desc": "Earn Points everyday for delegation", + "delegation_desc": "Hasilkan poin setiap hari untuk pendelegasian", "post_title": "Poin untuk kiriman", "comment_title": "Poin untuk komentar", "vote_title": "Poin untuk suara", @@ -30,7 +30,7 @@ "checkin_title": "Points for heartbeat", "referral": "Referensi", "referral_title": "Hadiah referensi", - "referral_desc": "Invite friends and earn Points", + "referral_desc": "Undang teman dan dapatkan poin", "checkin_extra_title": "Bonus penggunaan", "no_activity": "Tidak ada aktifitas terakhir", "outgoing_transfer_description": "", @@ -59,17 +59,17 @@ "to_placeholder": "Nama Pengguna", "memo_placeholder": "Masukan catatan anda disini", "transfer_token": "Transfer", - "purchase_estm": "GET POINTS", - "points": "Gift Points to someone", + "purchase_estm": "DAPATKAN POIN", + "points": "Hadiahkan poin kepada seseorang", "transfer_to_saving": "Untuk Menyimpan", "powerUp": "Power Up", "withdraw_to_saving": "Menarik Tabungan", - "steemconnect_title": "Hivesigner Transfer", + "steemconnect_title": "Transfer Hivesigner", "next": "LANJUT", "delegate": "Delegasikan", "power_down": "Turunkan Daya Kekuatan", - "withdraw_steem": "Withdraw HIVE", - "withdraw_sbd": "Withdraw HBD", + "withdraw_steem": "Penarikan Hive", + "withdraw_sbd": "Tarik HBD", "transfer_to_savings": "Untuk Tabungan", "convert": "Mengkonversi", "escrow_transfer": "Transfer Escrow", @@ -83,29 +83,29 @@ "fill_vesting_withdraw": "PowerDown dieksekusi", "estm": { "title": "Poin", - "buy": "GET POINTS" + "buy": "DAPATKAN POIN" }, "savingsteem": { - "title": "HIVE Savings" + "title": "Penyimpanan HIVE" }, "savingsbd": { - "title": "HBD Savings" + "title": "Tabungan HBD" }, "steem": { "title": "HIVE", - "buy": "GET HIVE" + "buy": "DAPATKAN HIVE" }, "sbd": { "title": "HBD", - "buy": "GET HBD" + "buy": "DAPATKAN HBD" }, "steem_power": { "title": "HIVE POWER" }, "btc": { "title": "BTC", - "buy": "GET BTC", - "address": "RECEIVE" + "buy": "DAPATKAN BTC", + "address": "TERIMA" } }, "notification": { @@ -118,9 +118,9 @@ "ignore": "mengabaikan anda", "reblog": "reblogged", "transfer": "ditransfer", - "spin": "Time to earn more Points", - "inactive": "Be active! Write a post, continue earning", - "referral": "joined with your referral, welcome them", + "spin": "Waktunya untuk mendapatkan lebih banyak poin", + "inactive": "Ayo aktif! Tulislah postingan, teruskan mengumpulkan pendapatan", + "referral": "bergabunglah dengan referral Anda, sambutlah mereka", "notification": "Pemberitahuan", "leaderboard": "Papan Peringkat", "epoint": "Poin", @@ -159,7 +159,7 @@ "voting_power": "Kekuatan Suara", "login_to_see": "Masuk untuk melihat", "follow_people": "Ikuti beberapa orang untuk mengisi umpan Anda", - "follow_communities": "Join some communities to fill your feed", + "follow_communities": "Bergabung dengan beberapa komunitas untuk mengisi linimasa anda", "havent_commented": "belum berkomentar", "havent_posted": "belum pernah mengirimkan sesuatu", "steem_power": "Hive Power", From e2343cd348f9488a293e6f9f2ca83f583f4126f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Mon, 21 Dec 2020 17:55:15 +0300 Subject: [PATCH 131/505] Fix editorScreen bugs; add gesture event when body is not enough long, change title is working now --- src/screens/editor/screen/editorScreen.js | 203 ++++++++++++---------- 1 file changed, 114 insertions(+), 89 deletions(-) diff --git a/src/screens/editor/screen/editorScreen.js b/src/screens/editor/screen/editorScreen.js index 02166c53f4..2a1c48d83f 100644 --- a/src/screens/editor/screen/editorScreen.js +++ b/src/screens/editor/screen/editorScreen.js @@ -2,6 +2,7 @@ import React, { Component } from 'react'; import { View, Animated } from 'react-native'; import { injectIntl } from 'react-intl'; import { get, isNull } from 'lodash'; +import { PanGestureHandler } from 'react-native-gesture-handler'; // Utils import { getWordsCount } from '../../../utils/editor'; @@ -202,7 +203,7 @@ class EditorScreen extends Component { }); }; - _handleOnTagAdded = async (tags) => { + _handleOnTagAdded = (tags) => { const { selectedCommunity } = this.state; if (tags.length > 0 && !isNull(selectedCommunity) && !isCommunity(tags[0])) { @@ -216,6 +217,16 @@ class EditorScreen extends Component { }); }; + _handleChangeTitle = (text) => { + const { fields: _fields } = this.state; + + _fields.title = text; + + this.setState({ fields: _fields }, () => { + this._handleFormUpdate('title', _fields.title); + }); + }; + _handlePressCommunity = (community) => { const { fields, selectedCommunity } = this.state; @@ -313,97 +324,111 @@ class EditorScreen extends Component { id: isEdit ? 'basic_header.update' : isReply ? 'basic_header.reply' : 'basic_header.publish', }); return ( - - - - - handleDatePickerChange(date, fields)} - handleRewardChange={handleRewardChange} - handleBeneficiaries={handleBeneficiaries} - handleOnBackPress={handleOnBackPress} - handleOnPressPreviewButton={this._handleOnPressPreviewButton} - handleOnSaveButtonPress={this._handleOnSaveButtonPress} - handleOnSubmit={this._handleOnSubmit} - isDraftSaved={isDraftSaved} - isDraftSaving={isDraftSaving} - isEdit={isEdit} - isFormValid={isFormValid} - isHasIcons - isLoading={isPostSending || isUploading} - isLoggedIn={isLoggedIn} - isPreviewActive={isPreviewActive} - isReply={isReply} - quickTitle={wordsCount > 0 && `${wordsCount} words`} - rightButtonText={rightButtonText} - /> - - - {showFields && ( - <> - {!isReply && !isEdit && ( - this.setState({ isCommunitiesListModalOpen: true })} - onPressIn={() => this.setState({ isCommunitiesListModalOpen: false })} - /> - )} - {isReply && !isEdit && } - {!isReply && } - {!isReply && !isPreviewActive && ( - this._getCommunity(hive)} - /> - )} - {!isReply && isPreviewActive && ( - 0 ? fields.tags : null} - componentID="tag-area" - intl={intl} - /> - )} - - )} - - + event.nativeEvent.translationY >= 25 && this._handleShowAnimatedContainer() + } + activeOffsetY={[-20, 20]} + > + + + + + handleDatePickerChange(date, fields)} + handleRewardChange={handleRewardChange} + handleBeneficiaries={handleBeneficiaries} + handleOnBackPress={handleOnBackPress} + handleOnPressPreviewButton={this._handleOnPressPreviewButton} + handleOnSaveButtonPress={this._handleOnSaveButtonPress} + handleOnSubmit={this._handleOnSubmit} + isDraftSaved={isDraftSaved} + isDraftSaving={isDraftSaving} + isEdit={isEdit} isFormValid={isFormValid} - handleOpenImagePicker={handleOnImagePicker} - intl={intl} - uploadedImage={uploadedImage} - initialFields={this._initialFields} - isReply={isReply} + isHasIcons isLoading={isPostSending || isUploading} - onFocus={this._handleDisappearAnimatedContainer} - onScrollToTop={this._handleShowAnimatedContainer} + isLoggedIn={isLoggedIn} + isPreviewActive={isPreviewActive} + isReply={isReply} + quickTitle={wordsCount > 0 && `${wordsCount} words`} + rightButtonText={rightButtonText} /> - - + + + {showFields && ( + <> + {!isReply && !isEdit && ( + this.setState({ isCommunitiesListModalOpen: true })} + onPressIn={() => this.setState({ isCommunitiesListModalOpen: false })} + /> + )} + {isReply && !isEdit && } + {!isReply && ( + + )} + {!isReply && !isPreviewActive && ( + + )} + {!isReply && isPreviewActive && ( + 0 ? fields.tags : null} + componentID="tag-area" + intl={intl} + /> + )} + + )} + + + + + ); } } From defc41b7c47aa8cda5869a23013d90a023d72217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Tue, 22 Dec 2020 00:01:46 +0300 Subject: [PATCH 132/505] Fix to show multiple loading for following and sunbscribing in feed screen --- .../view/userListItem/userListItem.js | 24 ++-- .../view/userListItem/userListItemStyles.js | 2 + .../posts/container/postsContainer.js | 107 ++++++++---------- src/components/posts/view/postsStyles.js | 1 + src/components/posts/view/postsView.js | 20 ++-- src/redux/actions/communitiesAction.js | 20 ++-- src/redux/actions/userAction.js | 20 ++-- src/redux/reducers/communitiesReducer.js | 81 +++++++------ src/redux/reducers/userReducer.js | 81 +++++++------ 9 files changed, 190 insertions(+), 166 deletions(-) diff --git a/src/components/basicUIElements/view/userListItem/userListItem.js b/src/components/basicUIElements/view/userListItem/userListItem.js index 7ed91d6d7b..788fba3819 100644 --- a/src/components/basicUIElements/view/userListItem/userListItem.js +++ b/src/components/basicUIElements/view/userListItem/userListItem.js @@ -2,6 +2,7 @@ import React from 'react'; import { ActivityIndicator, View, Text, TouchableOpacity } from 'react-native'; import { UserAvatar } from '../../../userAvatar'; +import Tag from '../tag/tagView'; import styles from './userListItemStyles'; const UserListItem = ({ @@ -66,17 +67,18 @@ const UserListItem = ({ ) : ( - - {rightText} - - {subRightText && {subRightText}} + {isFollowing ? ( + + ) : ( + <> + + {rightText} + + {subRightText && {subRightText}} + + )} ))} diff --git a/src/components/basicUIElements/view/userListItem/userListItemStyles.js b/src/components/basicUIElements/view/userListItem/userListItemStyles.js index cee6c8b5b5..2382f0892e 100644 --- a/src/components/basicUIElements/view/userListItem/userListItemStyles.js +++ b/src/components/basicUIElements/view/userListItem/userListItemStyles.js @@ -49,6 +49,8 @@ export default EStyleSheet.create({ textAlign: 'center', alignItems: 'center', width: 80, + height: 30, + justifyContent: 'center', }, text: { color: '$iconColor', diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index f13587d912..b903f7a112 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -57,10 +57,10 @@ const PostsContainer = ({ const pinCode = useSelector((state) => state.application.pin); const leaderboard = useSelector((state) => state.user.leaderboard); const communities = useSelector((state) => state.communities.communities); - const lastFollowedUser = useSelector((state) => state.user.followUser); - const lastUnfollowedUser = useSelector((state) => state.user.unfollowUser); - const lastSubscribedCommunity = useSelector((state) => state.communities.subscribeCommunity); - const lastLeftCommunity = useSelector((state) => state.communities.leaveCommunity); + const followingUsers = useSelector((state) => state.user.followingUsersInFeedScreen); + const subscribingCommunities = useSelector( + (state) => state.communities.subscribingCommunitiesInFeedScreen, + ); const [isNoPost, setIsNoPost] = useState(false); const [startPermlink, setStartPermlink] = useState(''); @@ -153,64 +153,56 @@ const PostsContainer = ({ }, [communities]); useEffect(() => { - if (!lastFollowedUser.loading) { - if (!lastFollowedUser.error && !isEmpty(lastFollowedUser.data)) { - const recommendeds = [...recommendedUsers]; - recommendeds.forEach((item) => { - if (item._id === lastFollowedUser.data.following) { - item.isFollowing = true; + const recommendeds = [...recommendedUsers]; + + Object.keys(followingUsers).map((following) => { + if (!followingUsers[following].loading) { + if (!followingUsers[following].error) { + if (followingUsers[following].isFollowing) { + recommendeds.forEach((item) => { + if (item._id === following) { + item.isFollowing = true; + } + }); + } else { + recommendeds.forEach((item) => { + if (item._id === following) { + item.isFollowing = false; + } + }); } - }); - - setRecommendedUsers(recommendeds); + } } - } - }, [lastFollowedUser]); + }); - useEffect(() => { - if (!lastUnfollowedUser.loading) { - if (!lastUnfollowedUser.error && !isEmpty(lastUnfollowedUser.data)) { - const recommendeds = [...recommendedUsers]; - recommendeds.forEach((item) => { - if (item._id === lastUnfollowedUser.data.following) { - item.isFollowing = false; - } - }); - - setRecommendedUsers(recommendeds); - } - } - }, [lastUnfollowedUser]); + setRecommendedUsers(recommendeds); + }, [followingUsers]); useEffect(() => { - if (!lastSubscribedCommunity.loading) { - if (!lastSubscribedCommunity.error && !isEmpty(lastSubscribedCommunity.data)) { - const recommendeds = [...recommendedCommunities]; - recommendeds.forEach((item) => { - if (item.name === lastSubscribedCommunity.data.communityId) { - item.isSubscribed = true; + const recommendeds = [...recommendedCommunities]; + + Object.keys(subscribingCommunities).map((communityId) => { + if (!subscribingCommunities[communityId].loading) { + if (!subscribingCommunities[communityId].error) { + if (subscribingCommunities[communityId].isSubscribed) { + recommendeds.forEach((item) => { + if (item.name === communityId) { + item.isSubscribed = true; + } + }); + } else { + recommendeds.forEach((item) => { + if (item.name === communityId) { + item.isSubscribed = false; + } + }); } - }); - - setRecommendedCommunities(recommendeds); + } } - } - }, [lastSubscribedCommunity]); + }); - useEffect(() => { - if (!lastLeftCommunity.loading) { - if (!lastLeftCommunity.error && !isEmpty(lastLeftCommunity.data)) { - const recommendeds = [...recommendedCommunities]; - recommendeds.forEach((item) => { - if (item.name === lastLeftCommunity.data.communityId) { - item.isSubscribed = false; - } - }); - - setRecommendedCommunities(recommendeds); - } - } - }, [lastLeftCommunity]); + setRecommendedCommunities(recommendeds); + }, [subscribingCommunities]); const _setFeedPosts = (_posts) => { dispatch(setFeedPosts(_posts)); @@ -472,6 +464,7 @@ const PostsContainer = ({ dispatch(subscribeAction(currentAccount, pinCode, data, successToastText, failToastText)); }; + console.log(followingUsers, 'followingUsers Container'); return ( ); }; diff --git a/src/components/posts/view/postsStyles.js b/src/components/posts/view/postsStyles.js index 91dcfacd4a..273ff186d2 100644 --- a/src/components/posts/view/postsStyles.js +++ b/src/components/posts/view/postsStyles.js @@ -38,5 +38,6 @@ export default EStyleSheet.create({ noPostTitle: { textAlign: 'center', marginVertical: 16, + color: '$primaryBlack', }, }); diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index bf2a49ebdb..f3e533a4ad 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -56,10 +56,8 @@ const PostsView = ({ recommendedCommunities, handleFollowUserButtonPress, handleSubscribeCommunityButtonPress, - lastFollowedUser, - lastUnfollowedUser, - lastSubscribedCommunity, - lastLeftCommunity, + followingUsers, + subscribingCommunities, }) => { const intl = useIntl(); const postsList = useRef(null); @@ -137,6 +135,7 @@ const PostsView = ({ if (isNoPost) { if (selectedFilterValue === 'feed') { if (selectedFeedSubfilterValue === 'friends') { + console.log(followingUsers, 'followingUsers'); return ( <> @@ -144,6 +143,7 @@ const PostsView = ({ ( @@ -177,6 +176,7 @@ const PostsView = ({ ); } else { + console.log(recommendedCommunities, 'recommendedCommunities'); return ( <> @@ -207,10 +207,8 @@ const PostsView = ({ handleSubscribeButtonPress={handleSubscribeCommunityButtonPress} isSubscribed={item.isSubscribed} isLoadingRightAction={ - (lastSubscribedCommunity.data.communityId === item.name && - lastSubscribedCommunity.loading) || - (lastLeftCommunity.data.communityId === item.name && - lastLeftCommunity.loading) + subscribingCommunities.hasOwnProperty(item.name) && + subscribingCommunities[item.name].loading } isLoggedIn={isLoggedIn} /> diff --git a/src/redux/actions/communitiesAction.js b/src/redux/actions/communitiesAction.js index 423c07448d..9be3338249 100644 --- a/src/redux/actions/communitiesAction.js +++ b/src/redux/actions/communitiesAction.js @@ -63,14 +63,14 @@ export const subscribeCommunity = (currentAccount, pin, data, successToastText, dispatch({ type: SUBSCRIBE_COMMUNITY, payload: data }); subscribeCommunityReq(currentAccount, pin, data) .then((res) => dispatch(subscribeCommunitySuccess(data, successToastText))) - .catch((err) => dispatch(subscribeCommunityFail(err, failToastText))); + .catch((err) => dispatch(subscribeCommunityFail(err, data, failToastText))); }; }; -export const subscribeCommunitySuccess = (communityData, successToastText) => { +export const subscribeCommunitySuccess = (data, successToastText) => { return (dispatch) => [ dispatch({ - payload: communityData, + payload: data, type: SUBSCRIBE_COMMUNITY_SUCCESS, }), dispatch({ @@ -80,10 +80,10 @@ export const subscribeCommunitySuccess = (communityData, successToastText) => { ]; }; -export const subscribeCommunityFail = (error, failToastText) => { +export const subscribeCommunityFail = (error, data, failToastText) => { return (dispatch) => [ dispatch({ - payload: error, + payload: data, type: SUBSCRIBE_COMMUNITY_FAIL, }), dispatch({ @@ -99,14 +99,14 @@ export const leaveCommunity = (currentAccount, pin, data, successToastText, fail dispatch({ type: LEAVE_COMMUNITY, payload: data }); subscribeCommunityReq(currentAccount, pin, data) .then((res) => dispatch(leaveCommunitySuccess(data, successToastText))) - .catch((err) => dispatch(leaveCommunityFail(err, failToastText))); + .catch((err) => dispatch(leaveCommunityFail(err, data, failToastText))); }; }; -export const leaveCommunitySuccess = (communityData, successToastText) => { +export const leaveCommunitySuccess = (data, successToastText) => { return (dispatch) => [ dispatch({ - payload: communityData, + payload: data, type: LEAVE_COMMUNITY_SUCCESS, }), dispatch({ @@ -116,10 +116,10 @@ export const leaveCommunitySuccess = (communityData, successToastText) => { ]; }; -export const leaveCommunityFail = (error, failToastText) => { +export const leaveCommunityFail = (error, data, failToastText) => { return (dispatch) => [ dispatch({ - payload: error, + payload: data, type: LEAVE_COMMUNITY_FAIL, }), dispatch({ diff --git a/src/redux/actions/userAction.js b/src/redux/actions/userAction.js index 60ca50e11e..29e87249a4 100644 --- a/src/redux/actions/userAction.js +++ b/src/redux/actions/userAction.js @@ -23,14 +23,14 @@ export const followUser = (currentAccount, pin, data, successToastText, failToas dispatch({ type: FOLLOW_USER, payload: data }); followUserReq(currentAccount, pin, data) .then((res) => dispatch(followUserSuccess(data, successToastText))) - .catch((err) => dispatch(followUserFail(err, failToastText))); + .catch((err) => dispatch(followUserFail(err, data, failToastText))); }; }; -export const followUserSuccess = (userData, successToastText) => { +export const followUserSuccess = (data, successToastText) => { return (dispatch) => [ dispatch({ - payload: userData, + payload: data, type: FOLLOW_USER_SUCCESS, }), dispatch({ @@ -40,10 +40,10 @@ export const followUserSuccess = (userData, successToastText) => { ]; }; -export const followUserFail = (error, failToastText) => { +export const followUserFail = (error, data, failToastText) => { return (dispatch) => [ dispatch({ - payload: error, + payload: data, type: FOLLOW_USER_FAIL, }), dispatch({ @@ -59,14 +59,14 @@ export const unfollowUser = (currentAccount, pin, data, successToastText, failTo dispatch({ type: UNFOLLOW_USER, payload: data }); unfollowUserReq(currentAccount, pin, data) .then((res) => dispatch(unfollowUserSuccess(data, successToastText))) - .catch((err) => dispatch(unfollowUserFail(err, failToastText))); + .catch((err) => dispatch(unfollowUserFail(err, data, failToastText))); }; }; -export const unfollowUserSuccess = (userData, successToastText) => { +export const unfollowUserSuccess = (data, successToastText) => { return (dispatch) => [ dispatch({ - payload: userData, + payload: data, type: UNFOLLOW_USER_SUCCESS, }), dispatch({ @@ -76,10 +76,10 @@ export const unfollowUserSuccess = (userData, successToastText) => { ]; }; -export const unfollowUserFail = (error, failToastText) => { +export const unfollowUserFail = (error, data, failToastText) => { return (dispatch) => [ dispatch({ - payload: error, + payload: data, type: UNFOLLOW_USER_FAIL, }), dispatch({ diff --git a/src/redux/reducers/communitiesReducer.js b/src/redux/reducers/communitiesReducer.js index f9f4857f62..7d9c682ede 100644 --- a/src/redux/reducers/communitiesReducer.js +++ b/src/redux/reducers/communitiesReducer.js @@ -24,15 +24,12 @@ const initialState = { loading: false, error: false, }, - subscribeCommunity: { - data: {}, - loading: false, - error: false, - }, - leaveCommunity: { - data: {}, - loading: false, - error: false, + subscribingCommunitiesInFeedScreen: { + //['name']: { + // isSubscribed: false, + // loading: false, + // error: false, + //} }, }; @@ -95,55 +92,73 @@ export default function (state = initialState, action) { case SUBSCRIBE_COMMUNITY: return { ...state, - subscribeCommunity: { - data: action.payload, - loading: true, - error: false, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: false, + loading: true, + error: false, + }, }, }; case SUBSCRIBE_COMMUNITY_SUCCESS: return { ...state, - subscribeCommunity: { - data: action.payload, - loading: false, - error: false, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: true, + loading: false, + error: false, + }, }, }; case SUBSCRIBE_COMMUNITY_FAIL: return { ...state, - subscribeCommunity: { - data: {}, - loading: false, - error: action.payload, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: false, + loading: false, + error: true, + }, }, }; case LEAVE_COMMUNITY: return { ...state, - leaveCommunity: { - data: action.payload, - loading: true, - error: false, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: true, + loading: true, + error: false, + }, }, }; case LEAVE_COMMUNITY_SUCCESS: return { ...state, - leaveCommunity: { - data: action.payload, - loading: false, - error: false, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: false, + loading: false, + error: false, + }, }, }; case LEAVE_COMMUNITY_FAIL: return { ...state, - leaveCommunity: { - data: {}, - loading: false, - error: action.payload, + subscribingCommunitiesInFeedScreen: { + ...state.subscribingCommunitiesInFeedScreen, + [action.payload.communityId]: { + isSubscribed: true, + loading: false, + error: true, + }, }, }; default: diff --git a/src/redux/reducers/userReducer.js b/src/redux/reducers/userReducer.js index 0170366ea1..ae52e26899 100644 --- a/src/redux/reducers/userReducer.js +++ b/src/redux/reducers/userReducer.js @@ -11,15 +11,12 @@ import { } from '../constants/constants'; const initialState = { - followUser: { - data: {}, - loading: false, - error: false, - }, - unfollowUser: { - data: {}, - loading: false, - error: false, + followingUsersInFeedScreen: { + //['username']: { + // isFollowing: false, + // loading: false, + // error: false + //} }, leaderboard: { data: [], @@ -33,55 +30,73 @@ export default function (state = initialState, action) { case FOLLOW_USER: return { ...state, - followUser: { - data: action.payload, - loading: true, - error: false, + followingUsersInFeedScreen: { + ...state.followingUsersInFeedScreen, + [action.payload.following]: { + isFollowing: false, + loading: true, + error: false, + }, }, }; case FOLLOW_USER_SUCCESS: return { ...state, - followUser: { - data: action.payload, - loading: false, - error: false, + followingUsersInFeedScreen: { + ...state.followingUsersInFeedScreen, + [action.payload.following]: { + isFollowing: true, + loading: false, + error: false, + }, }, }; case FOLLOW_USER_FAIL: return { ...state, - followUser: { - data: {}, - loading: false, - error: action.payload, + followingUsersInFeedScreen: { + ...state.followingUsersInFeedScreen, + [action.payload.following]: { + isFollowing: false, + loading: false, + error: true, + }, }, }; case UNFOLLOW_USER: return { ...state, - unfollowUser: { - data: action.payload, - loading: true, - error: false, + followingUsersInFeedScreen: { + ...state.followingUsersInFeedScreen, + [action.payload.following]: { + isFollowing: true, + loading: true, + error: false, + }, }, }; case UNFOLLOW_USER_SUCCESS: return { ...state, - unfollowUser: { - data: action.payload, - loading: false, - error: false, + followingUsersInFeedScreen: { + ...state.followingUsersInFeedScreen, + [action.payload.following]: { + isFollowing: false, + loading: false, + error: false, + }, }, }; case UNFOLLOW_USER_FAIL: return { ...state, - unfollowUser: { - data: {}, - loading: false, - error: action.payload, + followingUsersInFeedScreen: { + ...state.followingUsersInFeedScreen, + [action.payload.following]: { + isFollowing: true, + loading: false, + error: true, + }, }, }; case FETCH_LEADERBOARD: From 2a9dff5712187987ec7b9955f999ab9d9b258fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Tue, 22 Dec 2020 00:03:21 +0300 Subject: [PATCH 133/505] Remove console.log --- src/components/posts/container/postsContainer.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/posts/container/postsContainer.js b/src/components/posts/container/postsContainer.js index b903f7a112..b81d6a01ac 100644 --- a/src/components/posts/container/postsContainer.js +++ b/src/components/posts/container/postsContainer.js @@ -464,7 +464,6 @@ const PostsContainer = ({ dispatch(subscribeAction(currentAccount, pinCode, data, successToastText, failToastText)); }; - console.log(followingUsers, 'followingUsers Container'); return ( Date: Tue, 22 Dec 2020 00:04:39 +0300 Subject: [PATCH 134/505] Remove console.logs again --- src/components/posts/view/postsView.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js index f3e533a4ad..8e0952e5eb 100644 --- a/src/components/posts/view/postsView.js +++ b/src/components/posts/view/postsView.js @@ -135,7 +135,6 @@ const PostsView = ({ if (isNoPost) { if (selectedFilterValue === 'feed') { if (selectedFeedSubfilterValue === 'friends') { - console.log(followingUsers, 'followingUsers'); return ( <> @@ -176,7 +175,6 @@ const PostsView = ({ ); } else { - console.log(recommendedCommunities, 'recommendedCommunities'); return ( <> From 2a82bb71437be024d07fe04d9d5421d35e4ad04b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Tue, 22 Dec 2020 20:30:10 +0300 Subject: [PATCH 135/505] Fix the animation bug in editorScreen --- src/components/textInput/view/textInputView.js | 2 +- src/screens/editor/screen/editorScreen.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/textInput/view/textInputView.js b/src/components/textInput/view/textInputView.js index e8dca19194..808b0840eb 100644 --- a/src/components/textInput/view/textInputView.js +++ b/src/components/textInput/view/textInputView.js @@ -14,7 +14,7 @@ const TextInputView = ({ innerRef, height, style, onScrollToTop, ...props }) => keyboardAppearance={isDarkTheme ? 'dark' : 'light'} {...props} style={[styles.input, { minHeight: height }, style]} - onScroll={(event) => event.nativeEvent.contentOffset.y <= 0 && onScrollToTop()} + onScroll={(event) => event.nativeEvent.contentOffset.y === 0 && onScrollToTop()} /> )} diff --git a/src/screens/editor/screen/editorScreen.js b/src/screens/editor/screen/editorScreen.js index 2a1c48d83f..8ab4c5f920 100644 --- a/src/screens/editor/screen/editorScreen.js +++ b/src/screens/editor/screen/editorScreen.js @@ -260,13 +260,13 @@ class EditorScreen extends Component { Animated.timing(animatedViewHeight, { toValue: 0, - duration: 1000, // <-- animation duration + duration: 300, // <-- animation duration useNativeDriver: false, // <-- need to set false to prevent yellow box warning }).start(() => this.setState({ showFields: false })); Animated.timing(animatedViewOpacity, { toValue: 0, - duration: 1000, // <-- animation duration + duration: 300, // <-- animation duration useNativeDriver: false, // <-- need to set false to prevent yellow box warning }).start(); }; @@ -278,13 +278,13 @@ class EditorScreen extends Component { Animated.timing(animatedViewHeight, { toValue: 150, - duration: 1000, // <-- animation duration + duration: 300, // <-- animation duration useNativeDriver: false, // <-- need to set false to prevent yellow box warning }).start(); Animated.timing(animatedViewOpacity, { toValue: 1, - duration: 1000, // <-- animation duration + duration: 300, // <-- animation duration useNativeDriver: false, // <-- need to set false to prevent yellow box warning }).start(); }; From ae0e9592c187f8522807a6550a4eefe30e03d5bb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 24 Dec 2020 13:56:19 +0200 Subject: [PATCH 136/505] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index 60751c229f..db1e220c90 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -320,15 +320,15 @@ "success_favorite": "Favorit je dodat!", "success_unfavorite": "Favorit je uklonjen!", "success_follow": "Uspešno praćenje!", - "fail_follow": "Follow failed!", - "success_subscribe": "Subscribe success!", - "fail_subscribe": "Subscribe failed!", - "success_leave": "Leave success!", - "fail_leave": "Leave failed!", + "fail_follow": "Praćenje neuspešno!", + "success_subscribe": "Uspešna pretplata!", + "fail_subscribe": "Neuspešna pretplata!", + "success_leave": "Uspešan izlazak!", + "fail_leave": "Neuspešan izlazak!", "success_mute": "Isključivanje notifikacija uspešno!", "success_unmute": "Uključivanje notifikacija uspešno!", "success_unfollow": "Prestanak praćenja uspešan!", - "fail_unfollow": "Unfollow failed!", + "fail_unfollow": "Neuspešan prestanak praćenja!", "warning": "Upozorenje", "invalid_pincode": "Nevažeći PIN kod, molimo proverite i pokušajte ponovo.", "remove_alert": "Da li ste sigurni da želite da uklonite?", @@ -564,7 +564,7 @@ "details": "Detalji" }, "user": { - "follow": "Follow", - "unfollow": "Unfollow" + "follow": "Prati", + "unfollow": "Prestani da pratiš" } } From c1a25fdf4026f92ec282cde2d136bf30d56e134c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Fri, 25 Dec 2020 00:02:28 +0300 Subject: [PATCH 137/505] Fix android modal padding and editor buttons position --- .../basicUIElements/view/stickyBar/stickyBarView.js | 4 ++-- .../selectCommunityModal/view/selectCommunityModalStyles.js | 2 +- src/components/markdownEditor/view/markdownEditorStyles.js | 1 - src/components/markdownEditor/view/markdownEditorView.js | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/basicUIElements/view/stickyBar/stickyBarView.js b/src/components/basicUIElements/view/stickyBar/stickyBarView.js index 2802fc7861..e81da08ebd 100644 --- a/src/components/basicUIElements/view/stickyBar/stickyBarView.js +++ b/src/components/basicUIElements/view/stickyBar/stickyBarView.js @@ -2,9 +2,9 @@ import React from 'react'; import { View, SafeAreaView } from 'react-native'; import styles from './stickyBarStyles'; -const StickyBar = ({ children, isFixedFooter }) => ( +const StickyBar = ({ children, isFixedFooter, style }) => ( - {children} + {children} ); diff --git a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js index a8d82efc8b..6d1af525a8 100644 --- a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js +++ b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js @@ -2,7 +2,7 @@ import EStyleSheet from 'react-native-extended-stylesheet'; export default EStyleSheet.create({ searchInput: { - marginTop: 16, + marginTop: 32, }, searchedFlatList: { marginTop: 16, diff --git a/src/components/markdownEditor/view/markdownEditorStyles.js b/src/components/markdownEditor/view/markdownEditorStyles.js index 1a866a8025..ea81491c51 100644 --- a/src/components/markdownEditor/view/markdownEditorStyles.js +++ b/src/components/markdownEditor/view/markdownEditorStyles.js @@ -4,7 +4,6 @@ export default EStyleSheet.create({ container: { flex: 1, flexDirection: 'column', - alignItems: 'stretch', backgroundColor: '$primaryBackgroundColor', }, textWrapper: { diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js index 707bfd8a35..d7857dc392 100644 --- a/src/components/markdownEditor/view/markdownEditorView.js +++ b/src/components/markdownEditor/view/markdownEditorView.js @@ -219,8 +219,8 @@ const MarkdownEditorView = ({ return ( {!isPreviewActive ? ( From 0f6a892f67d5ab1ef1d9a9eabb19f1c7f80b58d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sat, 26 Dec 2020 22:20:13 +0300 Subject: [PATCH 138/505] Save whole user data in otherAccounts array. Also, will call switchAccount and realmData requests after switching account --- .../sideMenu/container/sideMenuContainer.js | 35 +++++++++++-------- .../container/applicationContainer.js | 24 ++++++------- src/screens/login/container/loginContainer.js | 2 +- src/screens/steem-connect/hiveSigner.js | 2 +- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/src/components/sideMenu/container/sideMenuContainer.js b/src/components/sideMenu/container/sideMenuContainer.js index 3ad17547ad..ab62638bba 100644 --- a/src/components/sideMenu/container/sideMenuContainer.js +++ b/src/components/sideMenu/container/sideMenuContainer.js @@ -35,11 +35,11 @@ class SideMenuContainer extends Component { const accounts = []; otherAccounts.forEach((element) => { - if (element.username !== currentAccount.name) { + if (element.name !== currentAccount.name) { accounts.push({ - name: `@${element.username}`, - username: element.username, - id: element.username, + name: `@${element.name}`, + username: element.name, + id: element.name, }); } }); @@ -61,21 +61,26 @@ class SideMenuContainer extends Component { } }; - _switchAccount = (anchor = null) => { - const { dispatch, currentAccount, navigation } = this.props; + _switchAccount = async (anchor = null) => { + const { dispatch, currentAccount, navigation, otherAccounts } = this.props; if (anchor !== currentAccount.name) { - switchAccount(anchor).then(async (accountData) => { - const realmData = await getUserDataWithUsername(anchor); - const _currentAccount = accountData; + navigation.closeDrawer(); - _currentAccount.username = _currentAccount.name; - _currentAccount.local = realmData[0]; + const accountData = otherAccounts.filter((account) => account.name === anchor)[0]; + const _currentAccount = accountData; - dispatch(updateCurrentAccount(_currentAccount)); - dispatch(isRenderRequired(true)); - navigation.closeDrawer(); - }); + _currentAccount.username = _currentAccount.name; + + dispatch(updateCurrentAccount(_currentAccount)); + dispatch(isRenderRequired(true)); + + const upToDateCurrentAccount = await switchAccount(anchor); + const realmData = await getUserDataWithUsername(anchor); + upToDateCurrentAccount.userName = upToDateCurrentAccount.name; + upToDateCurrentAccount.local = realmData[0]; + + dispatch(updateCurrentAccount(upToDateCurrentAccount)); } }; diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js index f60b989748..74ccb90d05 100644 --- a/src/screens/application/container/applicationContainer.js +++ b/src/screens/application/container/applicationContainer.js @@ -198,10 +198,12 @@ class ApplicationContainer extends Component { { isRenderRequire: false, }, - () => + () => { + console.log('isRenderRequire'); this.setState({ isRenderRequire: true, - }), + }); + }, ); dispatch(isRenderRequired(false)); } @@ -517,11 +519,7 @@ class ApplicationContainer extends Component { } removeUserData(accountData.username); } else { - dispatch( - addOtherAccount({ - username: accountData.username, - }), - ); + dispatch(addOtherAccount({ ...accountData })); // TODO: check post v2.2.5+ or remove setexistuser from login setExistUser(true); } @@ -652,9 +650,9 @@ class ApplicationContainer extends Component { this._enableNotification(name, false); if (_otherAccounts.length > 0) { - const targetAccountUsername = _otherAccounts[0].username; + const targetAccount = _otherAccounts[0]; - await this._switchAccount(targetAccountUsername); + await this._switchAccount(targetAccount); } else { dispatch(updateCurrentAccount({})); dispatch(login(false)); @@ -692,14 +690,16 @@ class ApplicationContainer extends Component { }); }; - _switchAccount = async (targetAccountUsername) => { + _switchAccount = async (targetAccount) => { const { dispatch, isConnected } = this.props; if (!isConnected) return; - const accountData = await switchAccount(targetAccountUsername); + dispatch(updateCurrentAccount(targetAccount)); + + const accountData = await switchAccount(targetAccount.username); + const realmData = await getUserDataWithUsername(targetAccount.username); - const realmData = await getUserDataWithUsername(targetAccountUsername); const _currentAccount = accountData; _currentAccount.username = accountData.name; [_currentAccount.local] = realmData; diff --git a/src/screens/login/container/loginContainer.js b/src/screens/login/container/loginContainer.js index 722694979b..cd29a33a88 100644 --- a/src/screens/login/container/loginContainer.js +++ b/src/screens/login/container/loginContainer.js @@ -61,7 +61,7 @@ class LoginContainer extends PureComponent { .then((result) => { if (result) { dispatch(updateCurrentAccount({ ...result })); - dispatch(addOtherAccount({ username: result.name })); + dispatch(addOtherAccount({ ...result })); dispatch(loginAction(true)); userActivity(result.name, 20); setExistUser(true); diff --git a/src/screens/steem-connect/hiveSigner.js b/src/screens/steem-connect/hiveSigner.js index 03c703c74e..4f7d5f799e 100644 --- a/src/screens/steem-connect/hiveSigner.js +++ b/src/screens/steem-connect/hiveSigner.js @@ -42,7 +42,7 @@ class HiveSigner extends PureComponent { .then((result) => { if (result) { dispatch(updateCurrentAccount({ ...result })); - dispatch(addOtherAccount({ username: result.name })); + dispatch(addOtherAccount({ ...result })); dispatch(loginAction(true)); if (isPinCodeOpen) { From 1304083b70b3cdcdcd6d12c1c11a86d8f2d7875b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sat, 26 Dec 2020 22:24:31 +0300 Subject: [PATCH 139/505] revert editorScreen animations --- .../markdownEditor/view/markdownEditorView.js | 10 +- .../textInput/view/textInputView.js | 3 +- src/screens/editor/screen/editorScreen.js | 233 ++++++------------ 3 files changed, 84 insertions(+), 162 deletions(-) diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js index d7857dc392..cb829f4be3 100644 --- a/src/components/markdownEditor/view/markdownEditorView.js +++ b/src/components/markdownEditor/view/markdownEditorView.js @@ -32,8 +32,6 @@ const MarkdownEditorView = ({ handleIsValid, componentID, uploadedImage, - onFocus, - onScrollToTop, }) => { const [text, setText] = useState(draftBody || ''); const [selection, setSelection] = useState({ start: 0, end: 0 }); @@ -219,8 +217,8 @@ const MarkdownEditorView = ({ return ( {!isPreviewActive ? ( @@ -228,7 +226,7 @@ const MarkdownEditorView = ({ )} diff --git a/src/components/textInput/view/textInputView.js b/src/components/textInput/view/textInputView.js index 808b0840eb..1c699e329f 100644 --- a/src/components/textInput/view/textInputView.js +++ b/src/components/textInput/view/textInputView.js @@ -6,7 +6,7 @@ import { ThemeContainer } from '../../../containers'; // Styles import styles from './textInputStyles'; -const TextInputView = ({ innerRef, height, style, onScrollToTop, ...props }) => ( +const TextInputView = ({ innerRef, height, style, ...props }) => ( {({ isDarkTheme }) => ( keyboardAppearance={isDarkTheme ? 'dark' : 'light'} {...props} style={[styles.input, { minHeight: height }, style]} - onScroll={(event) => event.nativeEvent.contentOffset.y === 0 && onScrollToTop()} /> )} diff --git a/src/screens/editor/screen/editorScreen.js b/src/screens/editor/screen/editorScreen.js index 8ab4c5f920..ebe3c18f7e 100644 --- a/src/screens/editor/screen/editorScreen.js +++ b/src/screens/editor/screen/editorScreen.js @@ -1,8 +1,7 @@ import React, { Component } from 'react'; -import { View, Animated } from 'react-native'; +import { View } from 'react-native'; import { injectIntl } from 'react-intl'; import { get, isNull } from 'lodash'; -import { PanGestureHandler } from 'react-native-gesture-handler'; // Utils import { getWordsCount } from '../../../utils/editor'; @@ -53,9 +52,6 @@ class EditorScreen extends Component { }, isCommunitiesListModalOpen: false, selectedCommunity: null, - animatedViewHeight: new Animated.Value(150), - animatedViewOpacity: new Animated.Value(1), - showFields: true, }; } @@ -203,7 +199,7 @@ class EditorScreen extends Component { }); }; - _handleOnTagAdded = (tags) => { + _handleOnTagAdded = async (tags) => { const { selectedCommunity } = this.state; if (tags.length > 0 && !isNull(selectedCommunity) && !isCommunity(tags[0])) { @@ -217,16 +213,6 @@ class EditorScreen extends Component { }); }; - _handleChangeTitle = (text) => { - const { fields: _fields } = this.state; - - _fields.title = text; - - this.setState({ fields: _fields }, () => { - this._handleFormUpdate('title', _fields.title); - }); - }; - _handlePressCommunity = (community) => { const { fields, selectedCommunity } = this.state; @@ -255,40 +241,6 @@ class EditorScreen extends Component { }); }; - _handleDisappearAnimatedContainer = () => { - const { animatedViewHeight, animatedViewOpacity } = this.state; - - Animated.timing(animatedViewHeight, { - toValue: 0, - duration: 300, // <-- animation duration - useNativeDriver: false, // <-- need to set false to prevent yellow box warning - }).start(() => this.setState({ showFields: false })); - - Animated.timing(animatedViewOpacity, { - toValue: 0, - duration: 300, // <-- animation duration - useNativeDriver: false, // <-- need to set false to prevent yellow box warning - }).start(); - }; - - _handleShowAnimatedContainer = () => { - const { animatedViewHeight, animatedViewOpacity } = this.state; - - this.setState({ showFields: true }); - - Animated.timing(animatedViewHeight, { - toValue: 150, - duration: 300, // <-- animation duration - useNativeDriver: false, // <-- need to set false to prevent yellow box warning - }).start(); - - Animated.timing(animatedViewOpacity, { - toValue: 1, - duration: 300, // <-- animation duration - useNativeDriver: false, // <-- need to set false to prevent yellow box warning - }).start(); - }; - render() { const { fields, @@ -298,9 +250,6 @@ class EditorScreen extends Component { isRemoveTag, isCommunitiesListModalOpen, selectedCommunity, - animatedViewHeight, - animatedViewOpacity, - showFields, } = this.state; const { handleOnImagePicker, @@ -324,111 +273,89 @@ class EditorScreen extends Component { id: isEdit ? 'basic_header.update' : isReply ? 'basic_header.reply' : 'basic_header.publish', }); return ( - - event.nativeEvent.translationY >= 25 && this._handleShowAnimatedContainer() - } - activeOffsetY={[-20, 20]} - > - - - + + + + handleDatePickerChange(date, fields)} + handleRewardChange={handleRewardChange} + handleBeneficiaries={handleBeneficiaries} + handleOnBackPress={handleOnBackPress} + handleOnPressPreviewButton={this._handleOnPressPreviewButton} + handleOnSaveButtonPress={this._handleOnSaveButtonPress} + handleOnSubmit={this._handleOnSubmit} + isDraftSaved={isDraftSaved} + isDraftSaving={isDraftSaving} + isEdit={isEdit} + isFormValid={isFormValid} + isHasIcons + isLoading={isPostSending || isUploading} + isLoggedIn={isLoggedIn} + isPreviewActive={isPreviewActive} + isReply={isReply} + quickTitle={wordsCount > 0 && `${wordsCount} words`} + rightButtonText={rightButtonText} + /> + + {!isReply && !isEdit && ( + this.setState({ isCommunitiesListModalOpen: true })} + onPressIn={() => this.setState({ isCommunitiesListModalOpen: false })} + /> + )} + {isReply && !isEdit && } + {!isReply && } + {!isReply && !isPreviewActive && ( + this._getCommunity(hive)} + /> + )} + {!isReply && isPreviewActive && ( + 0 ? fields.tags : null} + componentID="tag-area" + intl={intl} /> - - handleDatePickerChange(date, fields)} - handleRewardChange={handleRewardChange} - handleBeneficiaries={handleBeneficiaries} - handleOnBackPress={handleOnBackPress} - handleOnPressPreviewButton={this._handleOnPressPreviewButton} - handleOnSaveButtonPress={this._handleOnSaveButtonPress} - handleOnSubmit={this._handleOnSubmit} - isDraftSaved={isDraftSaved} - isDraftSaving={isDraftSaving} - isEdit={isEdit} + )} + 0 && `${wordsCount} words`} - rightButtonText={rightButtonText} + isLoading={isPostSending || isUploading} /> - - - {showFields && ( - <> - {!isReply && !isEdit && ( - this.setState({ isCommunitiesListModalOpen: true })} - onPressIn={() => this.setState({ isCommunitiesListModalOpen: false })} - /> - )} - {isReply && !isEdit && } - {!isReply && ( - - )} - {!isReply && !isPreviewActive && ( - - )} - {!isReply && isPreviewActive && ( - 0 ? fields.tags : null} - componentID="tag-area" - intl={intl} - /> - )} - - )} - - - - - + + ); } } From ce01efcbd20c5524e7a5ce570a464221f0cf67ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sat, 26 Dec 2020 22:26:03 +0300 Subject: [PATCH 140/505] remove console.log --- src/screens/application/container/applicationContainer.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js index 74ccb90d05..0e5dea3b56 100644 --- a/src/screens/application/container/applicationContainer.js +++ b/src/screens/application/container/applicationContainer.js @@ -198,12 +198,10 @@ class ApplicationContainer extends Component { { isRenderRequire: false, }, - () => { - console.log('isRenderRequire'); + () => this.setState({ isRenderRequire: true, - }); - }, + }), ); dispatch(isRenderRequired(false)); } From dcad29a66676720c48dd03b0ce517246627a812f Mon Sep 17 00:00:00 2001 From: feruzm Date: Sat, 26 Dec 2020 22:04:59 +0200 Subject: [PATCH 141/505] handle posturl null --- src/screens/application/container/applicationContainer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js index 0e5dea3b56..f870e0d819 100644 --- a/src/screens/application/container/applicationContainer.js +++ b/src/screens/application/container/applicationContainer.js @@ -258,7 +258,7 @@ class ApplicationContainer extends Component { const { currentAccount } = this.props; const postUrl = postUrlParser(url); - const { author, permlink } = postUrl; + const { author, permlink } = postUrl || {}; try { if (author) { From f6a447e25445aca7c0d591d964a6a5af3e3f8141 Mon Sep 17 00:00:00 2001 From: feruzm Date: Sat, 26 Dec 2020 22:19:44 +0200 Subject: [PATCH 142/505] fix env variable --- .env.example | 1 - src/config/ecencyApi.js | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index c171c2243a..c93871d1c4 100644 --- a/.env.example +++ b/.env.example @@ -2,7 +2,6 @@ ACTIVITY_WEBSOCKET_URL= BACKEND_URL= ECENCY_BACKEND_API= NEW_IMAGE_API= -OLD_IMAGE_API= PIN_KEY= DEFAULT_PIN= SEARCH_API_TOKEN= diff --git a/src/config/ecencyApi.js b/src/config/ecencyApi.js index 3e75c6f893..4fb43c9120 100644 --- a/src/config/ecencyApi.js +++ b/src/config/ecencyApi.js @@ -1,11 +1,12 @@ import axios from 'axios'; import Config from 'react-native-config'; +import VersionNumber from 'react-native-version-number'; const api = axios.create({ baseURL: Config.ECENCY_BACKEND_API, headers: { 'Content-Type': 'application/json', - 'User-Agent': Config.USER_AGENT, + 'User-Agent': `${Config.USER_AGENT}/${VersionNumber.appVersion}`, }, }); From 2a911baa255396971ab523b71e647036cdf31345 Mon Sep 17 00:00:00 2001 From: feruzm Date: Sun, 27 Dec 2020 09:48:19 +0200 Subject: [PATCH 143/505] fix userlistitem bug created with community select on editor --- src/components/leaderboard/view/leaderboardView.js | 1 + src/components/votersDisplay/view/votersDisplayView.js | 1 + 2 files changed, 2 insertions(+) diff --git a/src/components/leaderboard/view/leaderboardView.js b/src/components/leaderboard/view/leaderboardView.js index b9556dcc1c..c67903cd8b 100644 --- a/src/components/leaderboard/view/leaderboardView.js +++ b/src/components/leaderboard/view/leaderboardView.js @@ -31,6 +31,7 @@ class LeaderboardView extends PureComponent { isBlackRightColor rightText={get(item, 'points')} middleText={get(item, 'count')} + isLoggedIn itemIndex={index + 1} handleOnPress={() => handleOnUserPress(get(item, '_id'))} rightTextStyle={styles.rewardText} diff --git a/src/components/votersDisplay/view/votersDisplayView.js b/src/components/votersDisplay/view/votersDisplayView.js index 2e13f61afb..6ea54b86e8 100644 --- a/src/components/votersDisplay/view/votersDisplayView.js +++ b/src/components/votersDisplay/view/votersDisplayView.js @@ -49,6 +49,7 @@ const VotersDisplayView = ({ votes, navigation }) => { isHasRightItem isRightColor={item.is_down_vote} rightText={value} + isLoggedIn handleOnPress={() => _handleOnUserPress(item.voter)} isClickable subRightText={percent} From 8d1e231f97b22e615808cb0b772368b0a3b90c28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 27 Dec 2020 18:53:12 +0300 Subject: [PATCH 144/505] Add switch account modal --- src/components/basicUIElements/index.js | 2 + .../view/separator/separatorStyles.js | 9 ++ .../view/separator/separatorView.js | 8 ++ .../view/selectCommunityModalStyles.js | 5 - .../view/selectCommunityModalView.js | 3 +- src/components/index.js | 2 + src/components/modal/view/modalStyles.js | 9 +- src/components/modal/view/modalView.js | 33 +++--- .../sideMenu/container/sideMenuContainer.js | 25 ++--- .../sideMenu/view/sideMenuStyles.js | 43 +++++++- src/components/sideMenu/view/sideMenuView.js | 103 ++++++++++++++---- 11 files changed, 178 insertions(+), 64 deletions(-) create mode 100644 src/components/basicUIElements/view/separator/separatorStyles.js create mode 100644 src/components/basicUIElements/view/separator/separatorView.js diff --git a/src/components/basicUIElements/index.js b/src/components/basicUIElements/index.js index 14a7115e55..5e4c700e9e 100644 --- a/src/components/basicUIElements/index.js +++ b/src/components/basicUIElements/index.js @@ -10,6 +10,7 @@ import TextWithIcon from './view/textWithIcon/textWithIconView'; import UserListItem from './view/userListItem/userListItem'; import WalletLineItem from './view/walletLineItem/walletLineItemView'; import CommunityListItem from './view/communityListItem/communityListItem'; +import Separator from './view/separator/separatorView'; // Placeholders import ListItemPlaceHolder from './view/placeHolder/listItemPlaceHolderView'; @@ -46,4 +47,5 @@ export { WalletLineItem, WalletUnclaimedPlaceHolder, CommunitiesPlaceHolder, + Separator, }; diff --git a/src/components/basicUIElements/view/separator/separatorStyles.js b/src/components/basicUIElements/view/separator/separatorStyles.js new file mode 100644 index 0000000000..20e18d2e25 --- /dev/null +++ b/src/components/basicUIElements/view/separator/separatorStyles.js @@ -0,0 +1,9 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + separator: { + width: '100%', + height: 1, + backgroundColor: '$modalBackground', + }, +}); diff --git a/src/components/basicUIElements/view/separator/separatorView.js b/src/components/basicUIElements/view/separator/separatorView.js new file mode 100644 index 0000000000..4dda91ece6 --- /dev/null +++ b/src/components/basicUIElements/view/separator/separatorView.js @@ -0,0 +1,8 @@ +import React from 'react'; +import { View } from 'react-native'; + +import styles from './separatorStyles'; + +const Separator = ({ style }) => ; + +export default Separator; diff --git a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js index 6d1af525a8..a32bc640af 100644 --- a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js +++ b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalStyles.js @@ -14,9 +14,4 @@ export default EStyleSheet.create({ marginBottom: 8, color: '$primaryBlack', }, - separator: { - width: '100%', - height: 1, - color: '$modalBackground', - }, }); diff --git a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js index 544444517f..c35001a70c 100644 --- a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js +++ b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js @@ -4,6 +4,7 @@ import { injectIntl } from 'react-intl'; import CommunityCard from '../../../communityCard'; import { SearchInput } from '../../../searchInput'; +import { Separator } from '../../../basicUIElements'; import globalStyles from '../../../../globalStyles'; import styles from './selectCommunityModalStyles'; @@ -107,6 +108,4 @@ const SelectCommunityModalView = ({ ); }; -const Separator = () => ; - export default injectIntl(SelectCommunityModalView); diff --git a/src/components/index.js b/src/components/index.js index a5ec7932d0..a46c84ecd6 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -102,6 +102,7 @@ import { WalletDetailsPlaceHolder, WalletLineItem, WalletUnclaimedPlaceHolder, + Separator, } from './basicUIElements'; export { @@ -203,6 +204,7 @@ export { WalletDetailsPlaceHolder, WalletLineItem, WalletUnclaimedPlaceHolder, + Separator, HorizontalIconList, PopoverWrapper, }; diff --git a/src/components/modal/view/modalStyles.js b/src/components/modal/view/modalStyles.js index f9c2227999..b1fc5e0dc2 100644 --- a/src/components/modal/view/modalStyles.js +++ b/src/components/modal/view/modalStyles.js @@ -25,8 +25,7 @@ export default EStyleSheet.create({ alignSelf: 'center', textAlign: 'center', fontSize: 20, - marginLeft: 50, - fontWeight: '500', + fontWeight: '800', }, closeButton: { marginRight: 24, @@ -37,7 +36,9 @@ export default EStyleSheet.create({ fontSize: 24, color: '$primaryBlack', }, - safeArea: { - backgroundColor: '$primaryBackgroundColor', + bottomModal: { + justifyContent: 'flex-end', + margin: 0, + backgroundColor: 'rgba(0,0,0,0.35)', }, }); diff --git a/src/components/modal/view/modalView.js b/src/components/modal/view/modalView.js index 919f313263..ac2480242a 100644 --- a/src/components/modal/view/modalView.js +++ b/src/components/modal/view/modalView.js @@ -45,17 +45,17 @@ export default class Modal extends PureComponent { isOpen, children, isRadius, - isTransparent, + isTransparent = false, title, animationType = 'fade', isCloseButton, - presentationStyle = 'fullScreen', + isBottomModal = false, } = this.props; return ( this._handleOnOpen(this)} onModalHide={() => console.log('hide')} onModalDismiss={() => console.log('dismiss')} - presentationStyle={presentationStyle} {...this.props} > {title && ( - - - {title} - {isCloseButton && ( - this._handleOnClose()} - /> - )} - - + + {title} + {isCloseButton && ( + this._handleOnClose()} + /> + )} + )} {children} diff --git a/src/components/sideMenu/container/sideMenuContainer.js b/src/components/sideMenu/container/sideMenuContainer.js index ab62638bba..d47d1c08d7 100644 --- a/src/components/sideMenu/container/sideMenuContainer.js +++ b/src/components/sideMenu/container/sideMenuContainer.js @@ -8,9 +8,6 @@ import { updateCurrentAccount } from '../../../redux/actions/accountAction'; import { logout, isRenderRequired } from '../../../redux/actions/applicationActions'; -// Constanst -import { default as ROUTES } from '../../../constants/routeNames'; - // Component import SideMenuView from '../view/sideMenuView'; @@ -34,21 +31,23 @@ class SideMenuContainer extends Component { const { currentAccount } = this.props; const accounts = []; + console.log(otherAccounts, 'otherAccounts'); otherAccounts.forEach((element) => { - if (element.name !== currentAccount.name) { + if (element.username !== currentAccount.name) { accounts.push({ - name: `@${element.name}`, - username: element.name, - id: element.name, + name: `@${element.username}`, + username: element.username, + id: element.username, + displayName: element.display_name, }); } }); - accounts.push({ - name: 'Add Account', - route: ROUTES.SCREENS.LOGIN, - icon: 'user-follow', - id: 'add_account', - }); + // accounts.push({ + // name: 'Add Account', + // route: ROUTES.SCREENS.LOGIN, + // icon: 'user-follow', + // id: 'add_account', + // }); this.setState({ accounts }); }; diff --git a/src/components/sideMenu/view/sideMenuStyles.js b/src/components/sideMenu/view/sideMenuStyles.js index 869d2c2dd3..54fbe7d129 100644 --- a/src/components/sideMenu/view/sideMenuStyles.js +++ b/src/components/sideMenu/view/sideMenuStyles.js @@ -34,7 +34,7 @@ export default EStyleSheet.create({ marginRight: 10, }, userInfoWrapper: { - alignSelf: 'flex-end', + alignSelf: 'center', marginLeft: 15, width: 120, }, @@ -95,4 +95,45 @@ export default EStyleSheet.create({ height: '100%', flexDirection: 'row', }, + iconWrapper: { + width: 30, + height: 30, + borderRadius: 16, + borderColor: 'white', + borderWidth: 1, + alignItems: 'center', + justifyContent: 'center', + }, + accountTile: { + height: 60, + flexDirection: 'row', + paddingHorizontal: 16, + alignItems: 'center', + }, + nameContainer: { + marginLeft: 8, + }, + displayName: { + fontWeight: '600', + fontSize: 16, + color: '$primaryBlack', + }, + name: { + color: '$primaryDarkGray', + }, + accountModal: { + backgroundColor: '$primaryBackgroundColor', + }, + textButton: { + color: '$primaryBlue', + }, + buttonContainer: { + height: 50, + justifyContent: 'center', + paddingHorizontal: 16, + }, + separator: { + backgroundColor: '$darkIconColor', + height: 0.5, + }, }); diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index 2ac64271d3..7b9958f29a 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -1,21 +1,31 @@ import React, { Component, useEffect, useState, useRef } from 'react'; -import { View, Text, ImageBackground, FlatList, TouchableOpacity } from 'react-native'; +import { + View, + Text, + ImageBackground, + FlatList, + TouchableOpacity, + SafeAreaView, +} from 'react-native'; import { injectIntl, useIntl } from 'react-intl'; import LinearGradient from 'react-native-linear-gradient'; import ActionSheet from 'react-native-actionsheet'; import VersionNumber from 'react-native-version-number'; import { getStorageType } from '../../../realm/realm'; +import Modal from '../../modal'; // Components -import { IconButton } from '../../iconButton'; import { Icon } from '../../icon'; import { UserAvatar } from '../../userAvatar'; +import Separator from '../../basicUIElements/view/separator/separatorView'; // Constants import MENU from '../../../constants/sideMenuItems'; +import { default as ROUTES } from '../../../constants/routeNames'; // Styles import styles from './sideMenuStyles'; +import { TextButton } from '../../buttons'; // Images const SIDE_MENU_BACKGROUND = require('../../../assets/side_menu_background.png'); @@ -36,6 +46,7 @@ const SideMenuView = ({ ); const [isAddAccountIconActive, setIsAddAccountIconActive] = useState(false); const [storageT, setStorageT] = useState('R'); + const [isAccountsModalOpen, setIsAccountsModalOpen] = useState(false); // Component Life Cycles useEffect(() => { @@ -53,13 +64,12 @@ const SideMenuView = ({ // Component Functions const _handleOnPressAddAccountIcon = () => { - if (!isAddAccountIconActive) { - setMenuItems(accounts); - } else { - setMenuItems(isLoggedIn ? MENU.AUTH_MENU_ITEMS : MENU.NO_AUTH_MENU_ITEMS); - } - - setIsAddAccountIconActive(!isAddAccountIconActive); + // if (!isAddAccountIconActive) { + // setMenuItems(accounts); + // } else { + // setMenuItems(isLoggedIn ? MENU.AUTH_MENU_ITEMS : MENU.NO_AUTH_MENU_ITEMS); + // } + // setIsAddAccountIconActive(!isAddAccountIconActive); }; const _handleOnMenuItemPress = (item) => { @@ -68,11 +78,11 @@ const SideMenuView = ({ return; } - if (item.route) { - navigateToRoute(item.route); - } else { - switchAccount(item.username); - } + navigateToRoute(item.route); + }; + + const _toggleAccountsModalOpen = () => { + setIsAccountsModalOpen(!isAccountsModalOpen); }; useEffect(() => { @@ -118,6 +128,18 @@ const SideMenuView = ({ ); + const _renderAccountTile = (item) => ( + switchAccount(item.username)}> + + + {item.displayName && {item.displayName}} + {item.name} + + + ); + + console.log(accounts, 'accounts'); + return ( - + {currentAccount.display_name && ( {currentAccount.display_name} @@ -141,16 +168,15 @@ const SideMenuView = ({ - - + - + )} @@ -172,6 +198,41 @@ const SideMenuView = ({ index === 0 ? handleLogout() : null; }} /> + + + + } + renderItem={({ item }) => _renderAccountTile(item)} + scrollEnabled={false} + /> + + + navigateToRoute(ROUTES.SCREENS.REGISTER)} + /> + + + + navigateToRoute(ROUTES.SCREENS.LOGIN)} + /> + + + ); }; From a143447303e1be609b6c9f8ca0c31fbcef9d6749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 27 Dec 2020 20:14:10 +0300 Subject: [PATCH 145/505] Check persist user data for switching account --- .../sideMenu/container/sideMenuContainer.js | 38 +++++++++++++------ src/components/sideMenu/view/sideMenuView.js | 2 +- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/components/sideMenu/container/sideMenuContainer.js b/src/components/sideMenu/container/sideMenuContainer.js index d47d1c08d7..8ed13c3b8d 100644 --- a/src/components/sideMenu/container/sideMenuContainer.js +++ b/src/components/sideMenu/container/sideMenuContainer.js @@ -60,26 +60,40 @@ class SideMenuContainer extends Component { } }; - _switchAccount = async (anchor = null) => { + _switchAccount = async (switchingAccount = {}) => { const { dispatch, currentAccount, navigation, otherAccounts } = this.props; - if (anchor !== currentAccount.name) { + if (switchingAccount.username !== currentAccount.name) { navigation.closeDrawer(); - const accountData = otherAccounts.filter((account) => account.name === anchor)[0]; - const _currentAccount = accountData; + const accountData = otherAccounts.filter( + (account) => account.username === switchingAccount.username, + )[0]; - _currentAccount.username = _currentAccount.name; + // control user persist whole data or just username + if (accountData.name) { + accountData.username = accountData.name; - dispatch(updateCurrentAccount(_currentAccount)); - dispatch(isRenderRequired(true)); + dispatch(updateCurrentAccount(accountData)); + dispatch(isRenderRequired(true)); - const upToDateCurrentAccount = await switchAccount(anchor); - const realmData = await getUserDataWithUsername(anchor); - upToDateCurrentAccount.userName = upToDateCurrentAccount.name; - upToDateCurrentAccount.local = realmData[0]; + const upToDateCurrentAccount = await switchAccount(accountData.name); + const realmData = await getUserDataWithUsername(accountData.name); - dispatch(updateCurrentAccount(upToDateCurrentAccount)); + upToDateCurrentAccount.username = upToDateCurrentAccount.name; + upToDateCurrentAccount.local = realmData[0]; + + dispatch(updateCurrentAccount(upToDateCurrentAccount)); + } else { + const _currentAccount = await switchAccount(accountData.username); + const realmData = await getUserDataWithUsername(accountData.username); + + _currentAccount.username = _currentAccount.name; + _currentAccount.local = realmData[0]; + + dispatch(updateCurrentAccount(_currentAccount)); + dispatch(isRenderRequired(true)); + } } }; diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index 7b9958f29a..93ccf7beac 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -129,7 +129,7 @@ const SideMenuView = ({ ); const _renderAccountTile = (item) => ( - switchAccount(item.username)}> + switchAccount(item)}> {item.displayName && {item.displayName}} From 4b63f15562697563527cd95ac24c364b0d3769ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 27 Dec 2020 21:41:08 +0300 Subject: [PATCH 146/505] Design changes according to comments --- src/components/modal/view/modalStyles.js | 2 +- .../sideMenu/container/sideMenuContainer.js | 17 +++++------ .../sideMenu/view/sideMenuStyles.js | 18 +++++++++-- src/components/sideMenu/view/sideMenuView.js | 30 +++++++++++++------ src/themes/darkTheme.js | 2 +- src/themes/lightTheme.js | 2 +- 6 files changed, 48 insertions(+), 23 deletions(-) diff --git a/src/components/modal/view/modalStyles.js b/src/components/modal/view/modalStyles.js index b1fc5e0dc2..a63af276ce 100644 --- a/src/components/modal/view/modalStyles.js +++ b/src/components/modal/view/modalStyles.js @@ -16,7 +16,7 @@ export default EStyleSheet.create({ modalHeader: { backgroundColor: '$primaryBackgroundColor', flexDirection: 'row', - height: 40, + padding: 16, justifyContent: 'center', }, headerTitle: { diff --git a/src/components/sideMenu/container/sideMenuContainer.js b/src/components/sideMenu/container/sideMenuContainer.js index 8ed13c3b8d..bb1cce6c70 100644 --- a/src/components/sideMenu/container/sideMenuContainer.js +++ b/src/components/sideMenu/container/sideMenuContainer.js @@ -31,16 +31,15 @@ class SideMenuContainer extends Component { const { currentAccount } = this.props; const accounts = []; - console.log(otherAccounts, 'otherAccounts'); + otherAccounts.forEach((element) => { - if (element.username !== currentAccount.name) { - accounts.push({ - name: `@${element.username}`, - username: element.username, - id: element.username, - displayName: element.display_name, - }); - } + accounts.unshift({ + name: `@${element.username}`, + username: element.username, + id: element.username, + displayName: element.display_name, + isCurrentAccount: element.username === currentAccount.name, + }); }); // accounts.push({ // name: 'Add Account', diff --git a/src/components/sideMenu/view/sideMenuStyles.js b/src/components/sideMenu/view/sideMenuStyles.js index 54fbe7d129..cedf256bee 100644 --- a/src/components/sideMenu/view/sideMenuStyles.js +++ b/src/components/sideMenu/view/sideMenuStyles.js @@ -96,19 +96,25 @@ export default EStyleSheet.create({ flexDirection: 'row', }, iconWrapper: { - width: 30, - height: 30, + width: 32, + height: 32, borderRadius: 16, borderColor: 'white', borderWidth: 1, alignItems: 'center', justifyContent: 'center', }, + optionIcon: { + height: 16, + width: 16, + }, accountTile: { height: 60, flexDirection: 'row', paddingHorizontal: 16, alignItems: 'center', + flex: 1, + justifyContent: 'space-between', }, nameContainer: { marginLeft: 8, @@ -136,4 +142,12 @@ export default EStyleSheet.create({ backgroundColor: '$darkIconColor', height: 0.5, }, + avatarAndNameContainer: { + flexDirection: 'row', + alignItems: 'center', + }, + checkIcon: { + color: '$successColor', + paddingHorizontal: 12, + }, }); diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index 93ccf7beac..54b8e8332b 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -128,18 +128,29 @@ const SideMenuView = ({ ); + const _handlePressAccountTile = (item) => { + if (!item.isCurrentAccount) { + switchAccount(item); + } + + setIsAccountsModalOpen(false); + }; + const _renderAccountTile = (item) => ( - switchAccount(item)}> - - - {item.displayName && {item.displayName}} - {item.name} + _handlePressAccountTile(item)}> + + + + {item.displayName && {item.displayName}} + {item.name} + + {item.isCurrentAccount && ( + + )} ); - console.log(accounts, 'accounts'); - return ( @@ -201,9 +212,10 @@ const SideMenuView = ({ diff --git a/src/themes/darkTheme.js b/src/themes/darkTheme.js index 3c1a547e8a..ce4d9bf14b 100644 --- a/src/themes/darkTheme.js +++ b/src/themes/darkTheme.js @@ -30,7 +30,7 @@ export default { $darkIconColor: '#526d91', $dangerColor: '#fff', $warningColor: '#fff', - $successColor: '#fff', + $successColor: '#4BB543', $disableButton: '#fff', $shadowColor: '#80000000', $disableGray: '#fff', diff --git a/src/themes/lightTheme.js b/src/themes/lightTheme.js index 1408212a22..38818aa55c 100644 --- a/src/themes/lightTheme.js +++ b/src/themes/lightTheme.js @@ -30,7 +30,7 @@ export default { $borderTopColor: '#cfcfcf', $dangerColor: '#fff', $warningColor: '#fff', - $successColor: '#fff', + $successColor: '#4BB543', $disableButton: '#fff', $shadowColor: '#b0b0b0', $disableGray: '#fff', From ada2b5cdb931887d2492949eac56986c10ddd305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 27 Dec 2020 21:44:38 +0300 Subject: [PATCH 147/505] revert extra padding of check icon --- src/components/sideMenu/view/sideMenuStyles.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/sideMenu/view/sideMenuStyles.js b/src/components/sideMenu/view/sideMenuStyles.js index cedf256bee..81eaf51fb3 100644 --- a/src/components/sideMenu/view/sideMenuStyles.js +++ b/src/components/sideMenu/view/sideMenuStyles.js @@ -148,6 +148,5 @@ export default EStyleSheet.create({ }, checkIcon: { color: '$successColor', - paddingHorizontal: 12, }, }); From a21fec36c452fb73b2f2d432c4b33ab82678b5c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 27 Dec 2020 21:45:30 +0300 Subject: [PATCH 148/505] Remove unused codes --- src/components/sideMenu/container/sideMenuContainer.js | 6 ------ src/components/sideMenu/view/sideMenuView.js | 10 ---------- 2 files changed, 16 deletions(-) diff --git a/src/components/sideMenu/container/sideMenuContainer.js b/src/components/sideMenu/container/sideMenuContainer.js index bb1cce6c70..a65047b293 100644 --- a/src/components/sideMenu/container/sideMenuContainer.js +++ b/src/components/sideMenu/container/sideMenuContainer.js @@ -41,12 +41,6 @@ class SideMenuContainer extends Component { isCurrentAccount: element.username === currentAccount.name, }); }); - // accounts.push({ - // name: 'Add Account', - // route: ROUTES.SCREENS.LOGIN, - // icon: 'user-follow', - // id: 'add_account', - // }); this.setState({ accounts }); }; diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index 54b8e8332b..3c4f697aa1 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -62,16 +62,6 @@ const SideMenuView = ({ }, []); // Component Functions - - const _handleOnPressAddAccountIcon = () => { - // if (!isAddAccountIconActive) { - // setMenuItems(accounts); - // } else { - // setMenuItems(isLoggedIn ? MENU.AUTH_MENU_ITEMS : MENU.NO_AUTH_MENU_ITEMS); - // } - // setIsAddAccountIconActive(!isAddAccountIconActive); - }; - const _handleOnMenuItemPress = (item) => { if (item.id === 'logout') { ActionSheetRef.current.show(); From 49d17ed77b1763d56f75bb344e879b08a2233ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 27 Dec 2020 22:38:12 +0300 Subject: [PATCH 149/505] Add localization and remove unnecessary logic from sideMenuView --- src/components/sideMenu/view/sideMenuView.js | 16 ++++------------ src/config/locales/en-US.json | 5 ++++- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index 3c4f697aa1..6d300cb637 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -44,7 +44,6 @@ const SideMenuView = ({ const [menuItems, setMenuItems] = useState( isLoggedIn ? MENU.AUTH_MENU_ITEMS : MENU.NO_AUTH_MENU_ITEMS, ); - const [isAddAccountIconActive, setIsAddAccountIconActive] = useState(false); const [storageT, setStorageT] = useState('R'); const [isAccountsModalOpen, setIsAccountsModalOpen] = useState(false); @@ -76,9 +75,6 @@ const SideMenuView = ({ }; useEffect(() => { - if (isAddAccountIconActive) { - setMenuItems(accounts); - } setMenuItems(isLoggedIn ? MENU.AUTH_MENU_ITEMS : MENU.NO_AUTH_MENU_ITEMS); }, [isLoggedIn]); @@ -108,11 +104,7 @@ const SideMenuView = ({ )} - {isAddAccountIconActive - ? menuItems[menuItems.length - 1].id === item.item.id - ? intl.formatMessage({ id: `side_menu.${item.item.id}` }) - : item.item.name - : intl.formatMessage({ id: `side_menu.${item.item.id}` })} + {intl.formatMessage({ id: `side_menu.${item.item.id}` })} @@ -206,7 +198,7 @@ const SideMenuView = ({ isTransparent isRadius coverScreen={false} - title="Accounts" + title={intl.formatMessage({ id: 'side_menu.accounts' })} onBackdropPress={_toggleAccountsModalOpen} > @@ -220,7 +212,7 @@ const SideMenuView = ({ navigateToRoute(ROUTES.SCREENS.REGISTER)} /> @@ -228,7 +220,7 @@ const SideMenuView = ({ navigateToRoute(ROUTES.SCREENS.LOGIN)} /> diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 81d4f0ef68..2fa5ae0caa 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 2854da075169c3ff4e08c1f557d1909a7f6e2295 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:21 +0200 Subject: [PATCH 150/505] New translations en-US.json (Bengali) --- src/config/locales/bn-BD.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bn-BD.json b/src/config/locales/bn-BD.json index d98b5f113c..f09bbf130f 100644 --- a/src/config/locales/bn-BD.json +++ b/src/config/locales/bn-BD.json @@ -255,7 +255,10 @@ "add_account": "একাউন্ট যোগ করুন", "logout": "লগআউট", "cancel": "বাতিল করুন", - "logout_text": "আপনি কি নিশ্চিতভাবে লগআউট করতে চান?" + "logout_text": "আপনি কি নিশ্চিতভাবে লগআউট করতে চান?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "আপনার ফিডটি কাস্টমাইজ করতে লগইন করুন", From e32a4164357342862cbcf3bd4b2bf8e7ac675d0f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:23 +0200 Subject: [PATCH 151/505] New translations en-US.json (Croatian) --- src/config/locales/hr-HR.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hr-HR.json b/src/config/locales/hr-HR.json index 81ea8f23b9..9018ed127d 100644 --- a/src/config/locales/hr-HR.json +++ b/src/config/locales/hr-HR.json @@ -255,7 +255,10 @@ "add_account": "Dodaj Profil", "logout": "Odjava", "cancel": "Poništi", - "logout_text": "Jeste li sigurni da se želite odjaviti?" + "logout_text": "Jeste li sigurni da se želite odjaviti?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Ulogirajte se kako bi ste konfigurirali obavijesti", From 69febfe76d3faf8ceb5d6d2020b8a0f042edb080 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:25 +0200 Subject: [PATCH 152/505] New translations en-US.json (Malay) --- src/config/locales/ms-MY.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ms-MY.json b/src/config/locales/ms-MY.json index b57741cbe3..e65fd6f2e9 100644 --- a/src/config/locales/ms-MY.json +++ b/src/config/locales/ms-MY.json @@ -255,7 +255,10 @@ "add_account": "Tambah akaun", "logout": "Log Keluar", "cancel": "Batal", - "logout_text": "Anda pasti mahu log keluar?" + "logout_text": "Anda pasti mahu log keluar?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Log masuk untuk menyesuaikan suapan anda", From 42f0e96b4e5ce61e2c0cceaa05f376b1ee7989d3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:27 +0200 Subject: [PATCH 153/505] New translations en-US.json (Kyrgyz) --- src/config/locales/ky-KG.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ky-KG.json b/src/config/locales/ky-KG.json index f5dd1300ab..556f282edd 100644 --- a/src/config/locales/ky-KG.json +++ b/src/config/locales/ky-KG.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Чыгуу", "cancel": "Токтотуу", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From beb113897cbb4acecdd171c7a706c813e728ab1b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:28 +0200 Subject: [PATCH 154/505] New translations en-US.json (Azerbaijani) --- src/config/locales/az-AZ.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/az-AZ.json b/src/config/locales/az-AZ.json index 090f8d7b42..ad0a08f0a6 100644 --- a/src/config/locales/az-AZ.json +++ b/src/config/locales/az-AZ.json @@ -255,7 +255,10 @@ "add_account": "Hesab Əlavə et", "logout": "Çıxış", "cancel": "İmtina", - "logout_text": "Çıxış etmək istədiyinə əminsən?" + "logout_text": "Çıxış etmək istədiyinə əminsən?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Axınını özəlləşdirmək üçün giriş et", From 87babad4934bbdde66f190e735ad90b7dd4625c8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:30 +0200 Subject: [PATCH 155/505] New translations en-US.json (Latvian) --- src/config/locales/lv-LV.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/lv-LV.json b/src/config/locales/lv-LV.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/lv-LV.json +++ b/src/config/locales/lv-LV.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From d60f35730e839fd2d08bc28f45d229c67a6a5ee9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:32 +0200 Subject: [PATCH 156/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 26579cfb50..7c7994a5aa 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -255,7 +255,10 @@ "add_account": "Lisa konto", "logout": "Logi välja", "cancel": "Tühista", - "logout_text": "Oled kindel, et soovid välja logida?" + "logout_text": "Oled kindel, et soovid välja logida?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Logi sisse, et kohandada oma voogu", From b26f01c89464bb1564728a7457065c22480b7d57 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:34 +0200 Subject: [PATCH 157/505] New translations en-US.json (Kazakh) --- src/config/locales/kk-KZ.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/kk-KZ.json b/src/config/locales/kk-KZ.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/kk-KZ.json +++ b/src/config/locales/kk-KZ.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 4779ea147de99ab8bbd50f16621f9e567115a436 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:35 +0200 Subject: [PATCH 158/505] New translations en-US.json (Thai) --- src/config/locales/th-TH.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/th-TH.json b/src/config/locales/th-TH.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/th-TH.json +++ b/src/config/locales/th-TH.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 4dc143cee5a62542ab9518d296bcb3925fff700f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:37 +0200 Subject: [PATCH 159/505] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index 191ba0dccf..40fedbe35d 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -255,7 +255,10 @@ "add_account": "Magdagdag ng Account", "logout": "Mag-logout", "cancel": "Kansel", - "logout_text": "Sigurado kang gusto mong mag logout?" + "logout_text": "Sigurado kang gusto mong mag logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Mag login para i-customize ang iyong feed", From 89b473ab1f65090da6925e488546d042934a979c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:39 +0200 Subject: [PATCH 160/505] New translations en-US.json (Tamil) --- src/config/locales/ta-IN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ta-IN.json b/src/config/locales/ta-IN.json index 4d996b26eb..42efad8ff6 100644 --- a/src/config/locales/ta-IN.json +++ b/src/config/locales/ta-IN.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 32451431370bcfaf9cfb16902c261c9857463224 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:41 +0200 Subject: [PATCH 161/505] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index e8bb8bbb69..6e2931fe6c 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -255,7 +255,10 @@ "add_account": "اضافه کردن حساب کاربری", "logout": "خروج از حساب", "cancel": "صرف نظر", - "logout_text": "آیا مطمئنید که می‌خواهید خارج شوید؟" + "logout_text": "آیا مطمئنید که می‌خواهید خارج شوید؟", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "برای شخصی سازی فید های خود وارد شوید", From dac76cee8831483729827290f4357fc6f6b45ec3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:42 +0200 Subject: [PATCH 162/505] New translations en-US.json (Indonesian) --- src/config/locales/id-ID.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/id-ID.json b/src/config/locales/id-ID.json index 7ae4417c0a..33398e2201 100644 --- a/src/config/locales/id-ID.json +++ b/src/config/locales/id-ID.json @@ -255,7 +255,10 @@ "add_account": "Tambahkan Akun", "logout": "Keluar", "cancel": "Batal", - "logout_text": "Apakah Anda yakin ingin keluar?" + "logout_text": "Apakah Anda yakin ingin keluar?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login untuk menyesuaikan feed Anda", From c751d0aa303565588210f9e936ab2871dff81175 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:44 +0200 Subject: [PATCH 163/505] New translations en-US.json (Icelandic) --- src/config/locales/is-IS.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/is-IS.json b/src/config/locales/is-IS.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/is-IS.json +++ b/src/config/locales/is-IS.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 5ff9bfaadb3a18340b0a70e417ae1520f7ca59df Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:46 +0200 Subject: [PATCH 164/505] New translations en-US.json (Galician) --- src/config/locales/gl-ES.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/gl-ES.json b/src/config/locales/gl-ES.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/gl-ES.json +++ b/src/config/locales/gl-ES.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 2557ba95641713947b6cd24391aad4173dae2c5a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:48 +0200 Subject: [PATCH 165/505] New translations en-US.json (Vietnamese) --- src/config/locales/vi-VN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/vi-VN.json b/src/config/locales/vi-VN.json index be9012a873..9e67b9fe45 100644 --- a/src/config/locales/vi-VN.json +++ b/src/config/locales/vi-VN.json @@ -255,7 +255,10 @@ "add_account": "Thêm tài khoản", "logout": "Đăng xuất", "cancel": "Huỷ", - "logout_text": "Bạn có chắc chắn muốn đăng xuất?" + "logout_text": "Bạn có chắc chắn muốn đăng xuất?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Đăng nhập để tùy chỉnh nguồn cấp dữ liệu của bạn", From 1d4fe5e25d2f61670e5c8ccc4c3f2c1de8bfae5d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:50 +0200 Subject: [PATCH 166/505] New translations en-US.json (Esperanto) --- src/config/locales/eo-UY.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/eo-UY.json b/src/config/locales/eo-UY.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/eo-UY.json +++ b/src/config/locales/eo-UY.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 0c4a09b7ae35ff06dc546d94f175560b95690124 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:51 +0200 Subject: [PATCH 167/505] New translations en-US.json (Tibetan) --- src/config/locales/bo-BT.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bo-BT.json b/src/config/locales/bo-BT.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/bo-BT.json +++ b/src/config/locales/bo-BT.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 6435c763ee3d5d4a17621de2314e668a04955618 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:53 +0200 Subject: [PATCH 168/505] New translations en-US.json (Chinese Traditional) --- src/config/locales/zh-TW.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/zh-TW.json b/src/config/locales/zh-TW.json index e4629ce76a..acbf53d832 100644 --- a/src/config/locales/zh-TW.json +++ b/src/config/locales/zh-TW.json @@ -255,7 +255,10 @@ "add_account": "添加帳號", "logout": "登出", "cancel": "取消", - "logout_text": "您確定要登出嗎？" + "logout_text": "您確定要登出嗎？", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "登入後定制您的朋友圈", From b4efc5caf490e20c135898dbfa1f1e43d7fae269 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:55 +0200 Subject: [PATCH 169/505] New translations en-US.json (Kashmiri) --- src/config/locales/ks-IN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ks-IN.json b/src/config/locales/ks-IN.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/ks-IN.json +++ b/src/config/locales/ks-IN.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 91bae5d8a6f4928a2291cda5201ee4804f7e464f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:57 +0200 Subject: [PATCH 170/505] New translations en-US.json (Urdu (India)) --- src/config/locales/ur-IN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ur-IN.json b/src/config/locales/ur-IN.json index 937e2797ae..58152ea820 100644 --- a/src/config/locales/ur-IN.json +++ b/src/config/locales/ur-IN.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From ba0f612a28c766bae21815babb9d5fcd0b525e74 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:56:59 +0200 Subject: [PATCH 171/505] New translations en-US.json (Kabyle) --- src/config/locales/kab-KAB.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/kab-KAB.json b/src/config/locales/kab-KAB.json index ea7e956bbd..0fdf8f0635 100644 --- a/src/config/locales/kab-KAB.json +++ b/src/config/locales/kab-KAB.json @@ -255,7 +255,10 @@ "add_account": "Rnu amiḍan", "logout": "Tuffɣa", "cancel": "Sefsex", - "logout_text": "Tebɣiḍ s tidet ad teffɣeḍ?" + "logout_text": "Tebɣiḍ s tidet ad teffɣeḍ?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 11e39f65767f366bb080ec361dfa927fb89ad9c9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:01 +0200 Subject: [PATCH 172/505] New translations en-US.json (Gothic) --- src/config/locales/got-DE.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/got-DE.json b/src/config/locales/got-DE.json index 04fc49206a..2895e51c98 100644 --- a/src/config/locales/got-DE.json +++ b/src/config/locales/got-DE.json @@ -255,7 +255,10 @@ "add_account": "Anaaiauk rahnein", "logout": "Afleiþ", "cancel": "Fraqiþ", - "logout_text": "Wileis bi sunjai afleiþan?" + "logout_text": "Wileis bi sunjai afleiþan?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Atgagg du waljan þein feid", From e8e5d47e9bb4f865e4ba467f4730fa608b9a6106 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:02 +0200 Subject: [PATCH 173/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 7605234674..defad67be4 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "You sure say you wan logout?" + "logout_text": "You sure say you wan logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to arrange your tori", From 302cbfcabcc8066bf1b46429eb6d127b0288b1a3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:04 +0200 Subject: [PATCH 174/505] New translations en-US.json (Sanskrit) --- src/config/locales/sa-IN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sa-IN.json b/src/config/locales/sa-IN.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/sa-IN.json +++ b/src/config/locales/sa-IN.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 37c9b58bc14646e1f21234dc8e2f3b7e046c357e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:06 +0200 Subject: [PATCH 175/505] New translations en-US.json (Turkmen) --- src/config/locales/tk-TM.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/tk-TM.json b/src/config/locales/tk-TM.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/tk-TM.json +++ b/src/config/locales/tk-TM.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 7983b80d3113e7b7c2be51bb122c4d660e5fe271 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:08 +0200 Subject: [PATCH 176/505] New translations en-US.json (Cebuano) --- src/config/locales/ceb-PH.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ceb-PH.json b/src/config/locales/ceb-PH.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/ceb-PH.json +++ b/src/config/locales/ceb-PH.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 0788fd4adc37fe0d0e76596904c5b5acc3809c8e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:09 +0200 Subject: [PATCH 177/505] New translations en-US.json (Bosnian) --- src/config/locales/bs-BA.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bs-BA.json b/src/config/locales/bs-BA.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/bs-BA.json +++ b/src/config/locales/bs-BA.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From c142583afbadd1b833c192ec31b90a3bc197fc45 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:11 +0200 Subject: [PATCH 178/505] New translations en-US.json (Yoruba) --- src/config/locales/yo-NG.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/yo-NG.json b/src/config/locales/yo-NG.json index 73b10b1660..5123aeb3e2 100644 --- a/src/config/locales/yo-NG.json +++ b/src/config/locales/yo-NG.json @@ -255,7 +255,10 @@ "add_account": "Se afikun oruko akọọlẹ", "logout": "Jade kuro", "cancel": "Fa igi le", - "logout_text": "Se o da o loju pe o fe jade kuro?" + "logout_text": "Se o da o loju pe o fe jade kuro?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Se atewole lati seto ate igbawole re bi ose fe", From 4bf0dc896482f108a0d1e66aba86628f80628803 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:13 +0200 Subject: [PATCH 179/505] New translations en-US.json (Tajik) --- src/config/locales/tg-TJ.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/tg-TJ.json b/src/config/locales/tg-TJ.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/tg-TJ.json +++ b/src/config/locales/tg-TJ.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 413c359c114a998a187cfded2706da6d25a2d1cf Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:15 +0200 Subject: [PATCH 180/505] New translations en-US.json (Nepali) --- src/config/locales/ne-NP.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ne-NP.json b/src/config/locales/ne-NP.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/ne-NP.json +++ b/src/config/locales/ne-NP.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From dadc3142549da05f7c7a33a3c20d7ee8d9190847 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:16 +0200 Subject: [PATCH 181/505] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index db1e220c90..ae219d3a84 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -255,7 +255,10 @@ "add_account": "Dodaj Nalog", "logout": "Odjavi se", "cancel": "Otkaži", - "logout_text": "Da li ste sigurni da želite da se odjavite?" + "logout_text": "Da li ste sigurni da želite da se odjavite?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Prijavite se kako biste prilagodili vaše novosti", From 8d107e5fb586d4ca5acfd7b9cf94614474a9daf5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:18 +0200 Subject: [PATCH 182/505] New translations en-US.json (Swahili) --- src/config/locales/sw-KE.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sw-KE.json b/src/config/locales/sw-KE.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/sw-KE.json +++ b/src/config/locales/sw-KE.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 748bdef1ca501b060f181e2c72740d1f1e75d8a9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:20 +0200 Subject: [PATCH 183/505] New translations en-US.json (Assamese) --- src/config/locales/as-IN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/as-IN.json b/src/config/locales/as-IN.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/as-IN.json +++ b/src/config/locales/as-IN.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 003a21147bc4568d981dbccc1eda245a5799893c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:22 +0200 Subject: [PATCH 184/505] New translations en-US.json (Uzbek) --- src/config/locales/uz-UZ.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/uz-UZ.json b/src/config/locales/uz-UZ.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/uz-UZ.json +++ b/src/config/locales/uz-UZ.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From d7fdd0900581b93e5b3e38ece0cc1e42594d67c6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:24 +0200 Subject: [PATCH 185/505] New translations en-US.json (Urdu (Pakistan)) --- src/config/locales/ur-PK.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ur-PK.json b/src/config/locales/ur-PK.json index 937e2797ae..58152ea820 100644 --- a/src/config/locales/ur-PK.json +++ b/src/config/locales/ur-PK.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 3eb1da82227457d60789381c78661599ca210565 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:26 +0200 Subject: [PATCH 186/505] New translations en-US.json (Chinese Simplified) --- src/config/locales/zh-CN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/zh-CN.json b/src/config/locales/zh-CN.json index db79776198..a2df2937a0 100644 --- a/src/config/locales/zh-CN.json +++ b/src/config/locales/zh-CN.json @@ -255,7 +255,10 @@ "add_account": "添加帐户", "logout": "退出", "cancel": "取消", - "logout_text": "您确定想要退出吗？" + "logout_text": "您确定想要退出吗？", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "定制您的朋友圈，需要登录", From 5d50bfc66f84e01f624b78055d5810309f610fa6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:28 +0200 Subject: [PATCH 187/505] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index b41b497e7c..2c0da0a5c5 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -255,7 +255,10 @@ "add_account": "खता जोड़ें", "logout": "बहार जाएँ", "cancel": "रद्द करें", - "logout_text": "क्या आप सच में बाहर जाना चाहते हैं?" + "logout_text": "क्या आप सच में बाहर जाना चाहते हैं?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "आपकी अपनी संभरण को अपने अनुकूल संयोजित करने के लिए लॉगिन करें", From 45c1e247950b883dece569266bc640e39a0348b5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:30 +0200 Subject: [PATCH 188/505] New translations en-US.json (German) --- src/config/locales/de-DE.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index dd4bdb6291..9804167f1c 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -255,7 +255,10 @@ "add_account": "Konto hinzufügen", "logout": "Abmelden", "cancel": "Abbrechen", - "logout_text": "Bist du sicher, dass du dich ausloggen möchtest?" + "logout_text": "Bist du sicher, dass du dich ausloggen möchtest?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login, um den Feed anzupassen", From 6d58644ea0c634b077d95bbba181d308b81dddab Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:31 +0200 Subject: [PATCH 189/505] New translations en-US.json (Armenian) --- src/config/locales/hy-AM.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hy-AM.json b/src/config/locales/hy-AM.json index 21d34dc4b4..44b6aed4e6 100644 --- a/src/config/locales/hy-AM.json +++ b/src/config/locales/hy-AM.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 1959ba69d48ecf6a969961ce8465335260913edc Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:33 +0200 Subject: [PATCH 190/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 2a024dc84f..13af4c18d5 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -255,7 +255,10 @@ "add_account": "Fiók Hozzáadása", "logout": "Kijelentkezés", "cancel": "Elvet", - "logout_text": "Biztos ki szeretnél jelentkezni?" + "logout_text": "Biztos ki szeretnél jelentkezni?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Jelentkezz be a hírfolyam testreszabásához", From 1c62861260b478b838722c440d6d4b3916a0554a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:35 +0200 Subject: [PATCH 191/505] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index e830223dcd..f3ecb35d6e 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -255,7 +255,10 @@ "add_account": "הוסף/י חשבון", "logout": "התנתק/י", "cancel": "ביטול", - "logout_text": "האם את\\ה בטוח\\ה שברצונך להתנתק?" + "logout_text": "האם את\\ה בטוח\\ה שברצונך להתנתק?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "התחבר\\י כדי לעצב אישית את הפיד שלך", From e04ab907062db5a35155fb7f067a801bb7f27ffb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:37 +0200 Subject: [PATCH 192/505] New translations en-US.json (Irish) --- src/config/locales/ga-IE.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ga-IE.json b/src/config/locales/ga-IE.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/ga-IE.json +++ b/src/config/locales/ga-IE.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 2bccb638e29915401a33134b2cfb17a5a6bc4bdd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:39 +0200 Subject: [PATCH 193/505] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index ccc5d658ae..4611dcdf49 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -255,7 +255,10 @@ "add_account": "Lisää tili", "logout": "Kirjaudu ulos", "cancel": "Peruuta", - "logout_text": "Haluatko varmasti kirjautua ulos?" + "logout_text": "Haluatko varmasti kirjautua ulos?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Kirjaudu mukauttaaksesi syötettäsi", From 4ad77bc6a26c9414294935f644eaa9c24cc3a532 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:41 +0200 Subject: [PATCH 194/505] New translations en-US.json (Greek) --- src/config/locales/el-GR.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/el-GR.json b/src/config/locales/el-GR.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/el-GR.json +++ b/src/config/locales/el-GR.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From c0385ae20bc833a8f3e6ddaa6802f38ad5a5a3d2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:43 +0200 Subject: [PATCH 195/505] New translations en-US.json (Danish) --- src/config/locales/da-DK.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/da-DK.json b/src/config/locales/da-DK.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/da-DK.json +++ b/src/config/locales/da-DK.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From c0638c81ce848496f27855f7268b1b088aa92369 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:44 +0200 Subject: [PATCH 196/505] New translations en-US.json (Japanese) --- src/config/locales/ja-JP.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ja-JP.json b/src/config/locales/ja-JP.json index db917a6816..12709f81a6 100644 --- a/src/config/locales/ja-JP.json +++ b/src/config/locales/ja-JP.json @@ -255,7 +255,10 @@ "add_account": "アカウントを追加", "logout": "ログアウト", "cancel": "キャンセル", - "logout_text": "本当にログアウトしますか？" + "logout_text": "本当にログアウトしますか？", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "ログインして自分好みのフィードをつくろう", From e6f28c1cfdf28c13e1a1c4f06113f958f94665a6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:46 +0200 Subject: [PATCH 197/505] New translations en-US.json (Czech) --- src/config/locales/cs-CZ.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/cs-CZ.json b/src/config/locales/cs-CZ.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/cs-CZ.json +++ b/src/config/locales/cs-CZ.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 711399fd7511bc5e7f2ea2093e7c7e4f56ea17d9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:48 +0200 Subject: [PATCH 198/505] New translations en-US.json (Catalan) --- src/config/locales/ca-ES.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ca-ES.json b/src/config/locales/ca-ES.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/ca-ES.json +++ b/src/config/locales/ca-ES.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 9551af5794074d2b22bad3fc7f57f2868385113a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:50 +0200 Subject: [PATCH 199/505] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 572cfceedd..b3c4444e98 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -255,7 +255,10 @@ "add_account": "Добавяне на профил", "logout": "Изход", "cancel": "Отказ", - "logout_text": "Сигурни ли сте, че искате да излезете?" + "logout_text": "Сигурни ли сте, че искате да излезете?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Влезте, за да персонализирате вашите постове", From 6fff36fc0debe1e4b99c2f3da5ea3660715232b0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:51 +0200 Subject: [PATCH 200/505] New translations en-US.json (Arabic) --- src/config/locales/ar-SA.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json index 2e254ec5b8..1edde01d92 100644 --- a/src/config/locales/ar-SA.json +++ b/src/config/locales/ar-SA.json @@ -255,7 +255,10 @@ "add_account": "إضافة حساب", "logout": "تسجيل الخروج", "cancel": "إلغاء", - "logout_text": "هل أنت متأكد أنك تريد تسجيل الخروج؟" + "logout_text": "هل أنت متأكد أنك تريد تسجيل الخروج؟", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "تسجيل الدخول لتخصيص خلاصتك", From 8e208f4b718f20c527d3d5f27261ae01ecc1d9f6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:53 +0200 Subject: [PATCH 201/505] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index bfdcbe5061..9c5a5aeb3e 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -255,7 +255,10 @@ "add_account": "Agregar cuenta", "logout": "Cerrar sesión", "cancel": "Cancelar", - "logout_text": "¿Estás seguro de que quieres salir?" + "logout_text": "¿Estás seguro de que quieres salir?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Inicie sesión para personalizar su inicio", From ecd2bc51abfc06b23e1ca31ec30effa904acaa42 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:55 +0200 Subject: [PATCH 202/505] New translations en-US.json (Romanian) --- src/config/locales/ro-RO.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ro-RO.json b/src/config/locales/ro-RO.json index 6f3fb5d79f..c320bce01f 100644 --- a/src/config/locales/ro-RO.json +++ b/src/config/locales/ro-RO.json @@ -255,7 +255,10 @@ "add_account": "Adaugare Cont", "logout": "Deconectare", "cancel": "Anulează", - "logout_text": "Esti sigur că vrei să te deconectezi?" + "logout_text": "Esti sigur că vrei să te deconectezi?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Autentifică-te pentru a personaliza feed-ul", From 398c6bb15bdc239ad92f17115660ce873bd5ed2b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:56 +0200 Subject: [PATCH 203/505] New translations en-US.json (French) --- src/config/locales/fr-FR.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fr-FR.json b/src/config/locales/fr-FR.json index c2ab283489..b3344000fe 100644 --- a/src/config/locales/fr-FR.json +++ b/src/config/locales/fr-FR.json @@ -255,7 +255,10 @@ "add_account": "Ajouter un compte", "logout": "Déconnexion", "cancel": "Annuler", - "logout_text": "Voulez-vous vraiment vous déconnecter?" + "logout_text": "Voulez-vous vraiment vous déconnecter?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Connectez-vous pour personnaliser votre flux", From 84654c80027ab42524b866a73706bb5339e9cd2c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:57:58 +0200 Subject: [PATCH 204/505] New translations en-US.json (Italian) --- src/config/locales/it-IT.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/it-IT.json b/src/config/locales/it-IT.json index a0275316c8..50b57bce8b 100644 --- a/src/config/locales/it-IT.json +++ b/src/config/locales/it-IT.json @@ -255,7 +255,10 @@ "add_account": "Aggiungi Account", "logout": "Disconnettiti", "cancel": "Cancella", - "logout_text": "Sei sicuro di voler uscire?" + "logout_text": "Sei sicuro di voler uscire?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Effettua il Login per personalizzare il tuo feed", From a294fa0305dcc32bea23faf9a56f755f057fd535 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:00 +0200 Subject: [PATCH 205/505] New translations en-US.json (Georgian) --- src/config/locales/ka-GE.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ka-GE.json b/src/config/locales/ka-GE.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/ka-GE.json +++ b/src/config/locales/ka-GE.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 713c43c443b1b36b1b3a892a21106be4ef0a6e98 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:02 +0200 Subject: [PATCH 206/505] New translations en-US.json (Ukrainian) --- src/config/locales/uk-UA.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/uk-UA.json b/src/config/locales/uk-UA.json index 9a93c1471e..b422054523 100644 --- a/src/config/locales/uk-UA.json +++ b/src/config/locales/uk-UA.json @@ -255,7 +255,10 @@ "add_account": "Додати обліковий запис", "logout": "Вийти", "cancel": "Скасувати", - "logout_text": "Впевнені, що хочете вийти?" + "logout_text": "Впевнені, що хочете вийти?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Увійдіть, щоб налаштувати свій канал", From d05591a07c3ccd68fd201bc1c72fecf9eeb21cc8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:04 +0200 Subject: [PATCH 207/505] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index f3cc2dfe37..5242397955 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -255,7 +255,10 @@ "add_account": "Adicionar conta", "logout": "Sair", "cancel": "Cancelar", - "logout_text": "Tem certeza que deseja sair?" + "logout_text": "Tem certeza que deseja sair?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login para personalizar o seu feed", From 137192be09335962312b7ec6efded9404b1b188b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:05 +0200 Subject: [PATCH 208/505] New translations en-US.json (Turkish) --- src/config/locales/tr-TR.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/tr-TR.json b/src/config/locales/tr-TR.json index 3508021dd6..f15a70c296 100644 --- a/src/config/locales/tr-TR.json +++ b/src/config/locales/tr-TR.json @@ -255,7 +255,10 @@ "add_account": "Hesap Ekle", "logout": "Çık", "cancel": "Vazgeç", - "logout_text": "Çıkış yapmak istediginize emin misiniz?" + "logout_text": "Çıkış yapmak istediginize emin misiniz?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Giriş yap ve akışını özelleştir.", From c57c39ee8a1503b9d329d0189049be383aa48bab Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:07 +0200 Subject: [PATCH 209/505] New translations en-US.json (Swedish) --- src/config/locales/sv-SE.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sv-SE.json b/src/config/locales/sv-SE.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/sv-SE.json +++ b/src/config/locales/sv-SE.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From b3fa421298cb1abf7ae1aa38a98eab06baf72706 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:09 +0200 Subject: [PATCH 210/505] New translations en-US.json (Albanian) --- src/config/locales/sq-AL.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sq-AL.json b/src/config/locales/sq-AL.json index 21d34dc4b4..44b6aed4e6 100644 --- a/src/config/locales/sq-AL.json +++ b/src/config/locales/sq-AL.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 4b126f85dcfc1a8054494174d13acf75df87bfc8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:11 +0200 Subject: [PATCH 211/505] New translations en-US.json (Slovenian) --- src/config/locales/sl-SI.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sl-SI.json b/src/config/locales/sl-SI.json index 0588df49c3..4e416335b7 100644 --- a/src/config/locales/sl-SI.json +++ b/src/config/locales/sl-SI.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From cab9ac20fcc42f56fd8ecc12df99c9421d750ec5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:13 +0200 Subject: [PATCH 212/505] New translations en-US.json (Slovak) --- src/config/locales/sk-SK.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sk-SK.json b/src/config/locales/sk-SK.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/sk-SK.json +++ b/src/config/locales/sk-SK.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 6307df6cbb404c84f2ee84c09f3bcd77a6d39be1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:14 +0200 Subject: [PATCH 213/505] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index f1475f926b..a6f4f62f42 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -255,7 +255,10 @@ "add_account": "Добавить аккаунт", "logout": "Выйти", "cancel": "Отмена", - "logout_text": "Вы уверены, что хотите разлогина?" + "logout_text": "Вы уверены, что хотите разлогина?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Войдите, чтобы настроить свою ленту", From 8563ef5c944ca5a62e14214704115b87db478735 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:16 +0200 Subject: [PATCH 214/505] New translations en-US.json (Polish) --- src/config/locales/pl-PL.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pl-PL.json b/src/config/locales/pl-PL.json index 784d5a504f..f0c2055b56 100644 --- a/src/config/locales/pl-PL.json +++ b/src/config/locales/pl-PL.json @@ -255,7 +255,10 @@ "add_account": "Dodaj konto", "logout": "Wyloguj", "cancel": "Anuluj", - "logout_text": "Czy na pewno chcesz się wylogować?" + "logout_text": "Czy na pewno chcesz się wylogować?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Zaloguj się, aby dostosować swój kanał", From a9f558dad335e027493b803836570e270a5b8203 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:18 +0200 Subject: [PATCH 215/505] New translations en-US.json (Korean) --- src/config/locales/ko-KR.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ko-KR.json b/src/config/locales/ko-KR.json index 4c29e91e71..0282c7b4ad 100644 --- a/src/config/locales/ko-KR.json +++ b/src/config/locales/ko-KR.json @@ -255,7 +255,10 @@ "add_account": "계정 추가", "logout": "로그아웃", "cancel": "취소", - "logout_text": "로그 아웃 하시겠습니까?" + "logout_text": "로그 아웃 하시겠습니까?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "맞춤형 피드를 원하신다면 로그인하세요", From aa6fac1908106aaaa0340c5f7b3508fbae44936f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:20 +0200 Subject: [PATCH 216/505] New translations en-US.json (Punjabi) --- src/config/locales/pa-IN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pa-IN.json b/src/config/locales/pa-IN.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/pa-IN.json +++ b/src/config/locales/pa-IN.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 863006824e481b32ed4f46fa71c25b6e827bd855 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:21 +0200 Subject: [PATCH 217/505] New translations en-US.json (Norwegian) --- src/config/locales/no-NO.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/no-NO.json b/src/config/locales/no-NO.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/no-NO.json +++ b/src/config/locales/no-NO.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From c49be693e8626df6e66e3e5b1ff371ba5bc5b960 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:23 +0200 Subject: [PATCH 218/505] New translations en-US.json (Dutch) --- src/config/locales/nl-NL.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/nl-NL.json b/src/config/locales/nl-NL.json index db0041b95e..29a7101c1c 100644 --- a/src/config/locales/nl-NL.json +++ b/src/config/locales/nl-NL.json @@ -255,7 +255,10 @@ "add_account": "Account toevoegen", "logout": "Uitloggen", "cancel": "Annuleren", - "logout_text": "Weet je zeker dat je wilt uitloggen?" + "logout_text": "Weet je zeker dat je wilt uitloggen?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Log in om je feed aan te passen", From 2c0e28081f215381e2b848ee74c2793c3ad004ce Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:25 +0200 Subject: [PATCH 219/505] New translations en-US.json (Mongolian) --- src/config/locales/mn-MN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/mn-MN.json b/src/config/locales/mn-MN.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/mn-MN.json +++ b/src/config/locales/mn-MN.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 94a4dfbe0e2de9214b7ec44aa986241dec990fe6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:27 +0200 Subject: [PATCH 220/505] New translations en-US.json (Macedonian) --- src/config/locales/mk-MK.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/mk-MK.json b/src/config/locales/mk-MK.json index 4c4740fae8..87a414a58c 100644 --- a/src/config/locales/mk-MK.json +++ b/src/config/locales/mk-MK.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 88ddd95a5a2197e5a753bce78ed602e4d0a52720 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:29 +0200 Subject: [PATCH 221/505] New translations en-US.json (Lithuanian) --- src/config/locales/lt-LT.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/lt-LT.json b/src/config/locales/lt-LT.json index a7ebfbd492..e8c3d5508b 100644 --- a/src/config/locales/lt-LT.json +++ b/src/config/locales/lt-LT.json @@ -255,7 +255,10 @@ "add_account": "Pridėti paskyrą", "logout": "Atsijungti", "cancel": "Atšaukti", - "logout_text": "Ar tikrai norite atsijungti?" + "logout_text": "Ar tikrai norite atsijungti?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Prisijunkite norėdami keisti savo pagrindinį", From bd82ebf10697126cb88de0392e7adc266d2d7222 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:31 +0200 Subject: [PATCH 222/505] New translations en-US.json (Kurdish) --- src/config/locales/ku-TR.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ku-TR.json b/src/config/locales/ku-TR.json index 2fbd4a37cd..01a5255bc2 100644 --- a/src/config/locales/ku-TR.json +++ b/src/config/locales/ku-TR.json @@ -255,7 +255,10 @@ "add_account": "Ajimêr Tevlî Bike", "logout": "Derkeve", "cancel": "Betal", - "logout_text": "Bi rastî jî tu dixwazî jê derkevî?" + "logout_text": "Bi rastî jî tu dixwazî jê derkevî?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Têkevê û herka xwe kesane bike", From b573aea964261761b8a2e974febd7a34537e658f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 21:58:33 +0200 Subject: [PATCH 223/505] New translations en-US.json (Acehnese) --- src/config/locales/ac-ace.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ac-ace.json b/src/config/locales/ac-ace.json index ee417d2ede..bd06a10751 100644 --- a/src/config/locales/ac-ace.json +++ b/src/config/locales/ac-ace.json @@ -255,7 +255,10 @@ "add_account": "Tamah akun", "logout": "Teubit", "cancel": "Batëu", - "logout_text": "Peu betoi neu teubit?" + "logout_text": "Peu betoi neu teubit?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Tamöeng untuk seusuaikan haba deuh bak dröen", From e6e3372fbd17c1ea926564324bbf4c72696d0bb8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 22:06:15 +0200 Subject: [PATCH 224/505] Update source file en-US.json --- src/config/locales/en-US.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 81d4f0ef68..2fa5ae0caa 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -255,7 +255,10 @@ "add_account": "Add Account", "logout": "Logout", "cancel": "Cancel", - "logout_text": "Are you sure you want to logout?" + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" }, "header": { "title": "Login to customize your feed", From 2dc18d55ab67543c0fca6feec67862c838b34877 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 22:15:36 +0200 Subject: [PATCH 225/505] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index 9c5a5aeb3e..2dd031b0d1 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -256,9 +256,9 @@ "logout": "Cerrar sesión", "cancel": "Cancelar", "logout_text": "¿Estás seguro de que quieres salir?", - "create_a_new_account": "Create a new account", - "add_an_existing_account": "Add an existing account", - "accounts": "Accounts" + "create_a_new_account": "Crea una cuenta nueva", + "add_an_existing_account": "Añadir cuenta existente", + "accounts": "Cuentas" }, "header": { "title": "Inicie sesión para personalizar su inicio", From 5ed7256197313c51b0068e194e6272056b4101dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 27 Dec 2020 23:18:41 +0300 Subject: [PATCH 226/505] Add persistAccountGenerator to utils --- .../sideMenu/container/sideMenuContainer.js | 2 +- .../container/applicationContainer.js | 4 +- src/screens/login/container/loginContainer.js | 6 +- src/screens/steem-connect/hiveSigner.js | 5 +- src/utils/persistAccountGenerator.js | 55 +++++++++++++++++++ 5 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 src/utils/persistAccountGenerator.js diff --git a/src/components/sideMenu/container/sideMenuContainer.js b/src/components/sideMenu/container/sideMenuContainer.js index a65047b293..3604f6ad15 100644 --- a/src/components/sideMenu/container/sideMenuContainer.js +++ b/src/components/sideMenu/container/sideMenuContainer.js @@ -33,7 +33,7 @@ class SideMenuContainer extends Component { const accounts = []; otherAccounts.forEach((element) => { - accounts.unshift({ + accounts.push({ name: `@${element.username}`, username: element.username, id: element.username, diff --git a/src/screens/application/container/applicationContainer.js b/src/screens/application/container/applicationContainer.js index f870e0d819..888155e97e 100644 --- a/src/screens/application/container/applicationContainer.js +++ b/src/screens/application/container/applicationContainer.js @@ -81,6 +81,7 @@ import { encryptKey } from '../../../utils/crypto'; import darkTheme from '../../../themes/darkTheme'; import lightTheme from '../../../themes/lightTheme'; +import persistAccountGenerator from '../../../utils/persistAccountGenerator'; // Workaround let previousAppState = 'background'; @@ -517,7 +518,8 @@ class ApplicationContainer extends Component { } removeUserData(accountData.username); } else { - dispatch(addOtherAccount({ ...accountData })); + const persistAccountData = persistAccountGenerator(accountData); + dispatch(addOtherAccount({ ...persistAccountData })); // TODO: check post v2.2.5+ or remove setexistuser from login setExistUser(true); } diff --git a/src/screens/login/container/loginContainer.js b/src/screens/login/container/loginContainer.js index cd29a33a88..6ce6b32fcd 100644 --- a/src/screens/login/container/loginContainer.js +++ b/src/screens/login/container/loginContainer.js @@ -32,6 +32,7 @@ import ROUTES from '../../../constants/routeNames'; // Component import LoginScreen from '../screen/loginScreen'; +import persistAccountGenerator from '../../../utils/persistAccountGenerator'; /* * Props Name Description Value @@ -60,9 +61,12 @@ class LoginContainer extends PureComponent { login(username, password, isPinCodeOpen) .then((result) => { if (result) { + const persistAccountData = persistAccountGenerator(result); + dispatch(updateCurrentAccount({ ...result })); - dispatch(addOtherAccount({ ...result })); + dispatch(addOtherAccount({ ...persistAccountData })); dispatch(loginAction(true)); + userActivity(result.name, 20); setExistUser(true); this._setPushToken(result.name); diff --git a/src/screens/steem-connect/hiveSigner.js b/src/screens/steem-connect/hiveSigner.js index 4f7d5f799e..c841d112c3 100644 --- a/src/screens/steem-connect/hiveSigner.js +++ b/src/screens/steem-connect/hiveSigner.js @@ -14,6 +14,7 @@ import { login as loginAction, openPinCodeModal } from '../../redux/actions/appl // Constants import { default as ROUTES } from '../../constants/routeNames'; +import persistAccountGenerator from '../../utils/persistAccountGenerator'; class HiveSigner extends PureComponent { constructor(props) { @@ -41,8 +42,10 @@ class HiveSigner extends PureComponent { loginWithSC2(code[1], isPinCodeOpen) .then((result) => { if (result) { + const persistAccountData = persistAccountGenerator(result); + dispatch(updateCurrentAccount({ ...result })); - dispatch(addOtherAccount({ ...result })); + dispatch(addOtherAccount({ ...persistAccountData })); dispatch(loginAction(true)); if (isPinCodeOpen) { diff --git a/src/utils/persistAccountGenerator.js b/src/utils/persistAccountGenerator.js new file mode 100644 index 0000000000..173eb90ec7 --- /dev/null +++ b/src/utils/persistAccountGenerator.js @@ -0,0 +1,55 @@ +export default (accountData) => { + const persistData = {}; + + Object.assign(persistData, { + about: accountData.about, + active: accountData.active, + avatar: accountData.avatar, + balance: accountData.balance, + can_vote: accountData.can_vote, + comment_count: accountData.comment_count, + created: accountData.created, + delegated_hive_power: accountData.delegated_hive_power, + delegated_vesting_shares: accountData.delegated_vesting_shares, + display_name: accountData.display_name, + downvote_manabar: accountData.downvote_manabar, + hbd_balance: accountData.hbd_balance, + id: accountData.id, + json_metadata: accountData.json_metadata, + local: accountData.local, + memo_key: accountData.memo_key, + name: accountData.name, + next_vesting_withdrawal: accountData.next_vesting_withdrawal, + owner: accountData.owner, + password: accountData.password, + post_count: accountData.post_count, + posting: accountData.posting, + posting_json_metadata: accountData.posting_json_metadata, + rc_manabar: accountData.rc_manabar, + received_hive_power: accountData.received_hive_power, + received_vesting_shares: accountData.received_vesting_shares, + reputation: accountData.reputation, + reward_hbd_balance: accountData.reward_hbd_balance, + reward_hive_balance: accountData.reward_hive_balance, + reward_vesting_balance: accountData.reward_vesting_balance, + reward_vesting_hive: accountData.reward_vesting_hive, + savings_balance: accountData.savings_balance, + savings_hbd_balance: accountData.savings_hbd_balance, + savings_hbd_seconds: accountData.savings_hbd_seconds, + savings_withdraw_requests: accountData.savings_withdraw_requests, + hive_power: accountData.hive_power, + to_withdraw: accountData.to_withdraw, + unread_activity_count: accountData.unread_activity_count, + username: accountData.username, + vesting_balance: accountData.vesting_balance, + vesting_shares: accountData.vesting_shares, + vesting_withdraw_rate: accountData.vesting_withdraw_rate, + voting_manabar: accountData.voting_manabar, + voting_power: accountData.voting_power, + vp_manabar: accountData.vp_manabar, + withdraw_routes: accountData.withdraw_routes, + withdrawn: accountData.withdrawn, + }); + + return persistData; +}; From 1ab6fe00a91a536e3827648d2f330975ad16b15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 27 Dec 2020 23:32:46 +0300 Subject: [PATCH 227/505] Add null check for accountData --- src/utils/persistAccountGenerator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/persistAccountGenerator.js b/src/utils/persistAccountGenerator.js index 173eb90ec7..1e9b6830af 100644 --- a/src/utils/persistAccountGenerator.js +++ b/src/utils/persistAccountGenerator.js @@ -1,4 +1,4 @@ -export default (accountData) => { +export default (accountData = {}) => { const persistData = {}; Object.assign(persistData, { From c709c7655a6ce1042b50faff1df5512fe2e46388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Sun, 27 Dec 2020 23:39:01 +0300 Subject: [PATCH 228/505] Enable scroll in accounts list in sideMenuView --- src/components/sideMenu/view/sideMenuView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index 6d300cb637..0d7cef88c7 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -207,7 +207,7 @@ const SideMenuView = ({ data={accounts} ItemSeparatorComponent={() => } renderItem={({ item }) => _renderAccountTile(item)} - scrollEnabled={false} + scrollEnabled /> From d789481434d6c4940033bd0446d7a67c0542a4a5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Sun, 27 Dec 2020 23:18:56 +0200 Subject: [PATCH 229/505] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index 4611dcdf49..163cdf9f26 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -256,9 +256,9 @@ "logout": "Kirjaudu ulos", "cancel": "Peruuta", "logout_text": "Haluatko varmasti kirjautua ulos?", - "create_a_new_account": "Create a new account", - "add_an_existing_account": "Add an existing account", - "accounts": "Accounts" + "create_a_new_account": "Luo uusi tili", + "add_an_existing_account": "Lisää olemassa oleva tili", + "accounts": "Tilit" }, "header": { "title": "Kirjaudu mukauttaaksesi syötettäsi", From 2fcd8b1a632aea42da66359f1b666bb544df5563 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 28 Dec 2020 15:38:11 +0200 Subject: [PATCH 230/505] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index 2c0da0a5c5..e1c96b9fcd 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -256,9 +256,9 @@ "logout": "बहार जाएँ", "cancel": "रद्द करें", "logout_text": "क्या आप सच में बाहर जाना चाहते हैं?", - "create_a_new_account": "Create a new account", - "add_an_existing_account": "Add an existing account", - "accounts": "Accounts" + "create_a_new_account": "एक नया खाता बनाएं", + "add_an_existing_account": "एक मौजूदा खाता जोड़ें", + "accounts": "खाते" }, "header": { "title": "आपकी अपनी संभरण को अपने अनुकूल संयोजित करने के लिए लॉगिन करें", @@ -323,15 +323,15 @@ "success_favorite": "पसंदीदा जोड़ा!", "success_unfavorite": "पसंदीदा हटा दिया गया!", "success_follow": "सफलता का पालन करें!", - "fail_follow": "Follow failed!", - "success_subscribe": "Subscribe success!", - "fail_subscribe": "Subscribe failed!", - "success_leave": "Leave success!", - "fail_leave": "Leave failed!", + "fail_follow": "फॉलो फेल हो गए!", + "success_subscribe": "सदस्यता लें सफलता!", + "fail_subscribe": "सदस्यता लें विफल!", + "success_leave": "सफलता छोड़ो!", + "fail_leave": "छोड़ो असफल!", "success_mute": "सफलता को म्यूट करें!", "success_unmute": "सफलता को बेपर्दा करो!", "success_unfollow": "असफल सफलता!", - "fail_unfollow": "Unfollow failed!", + "fail_unfollow": "उनफॉलो असफल रहा!", "warning": "चेतावनी", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "क्या आप इसे सच में हटाना चाहते हैं?", @@ -567,7 +567,7 @@ "details": "विवरण" }, "user": { - "follow": "Follow", - "unfollow": "Unfollow" + "follow": "फॉलो करें", + "unfollow": "अनफॉलो करें" } } From 6d50dc6ea6f8b5833cdb0076c98ac641c2135d42 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 29 Dec 2020 16:57:22 +0200 Subject: [PATCH 231/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 7c7994a5aa..9c497edb32 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -71,7 +71,7 @@ "withdraw_steem": "Withdraw HIVE", "withdraw_sbd": "Withdraw HBD", "transfer_to_savings": "To Savings", - "convert": "Convert", + "convert": "Konverteeri", "escrow_transfer": "Escrow Transfer", "escrow_dispute": "Escrow Dispute", "escrow_release": "Escrow Release", @@ -86,10 +86,10 @@ "buy": "GET POINTS" }, "savingsteem": { - "title": "HIVE Savings" + "title": "HIVE Hoius" }, "savingsbd": { - "title": "HBD Savings" + "title": "HBD Hoius" }, "steem": { "title": "HIVE", From 0e6d7de12d44b0064213e96ec5733421cdb83581 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 29 Dec 2020 17:07:07 +0200 Subject: [PATCH 232/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 9c497edb32..a8897aa882 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -6,7 +6,7 @@ "claim_reward_balance": "Claim Reward ", "transfer": "Ülekanne", "transfer_to_vesting": "To Vesting", - "transfer_from_savings": "From Savings", + "transfer_from_savings": "Hoiusest", "withdraw_vesting": "Väljaluülitus", "fill_order": "Täida Tellimus", "post": "Postitus", @@ -19,7 +19,7 @@ "outgoing_transfer_title": "Väljuv ülekanne", "checkin_extra": "Boonus", "delegation": "Volitus", - "delegations": "Delegations", + "delegations": "Volitused", "delegation_title": "Volitustasu", "delegation_desc": "Earn Points everyday for delegation", "post_title": "Punktid postitustest", @@ -28,7 +28,7 @@ "reblog_title": "Punktid taaspostitustest", "login_title": "Punktid sisselogimisest", "checkin_title": "Punktid sisse logimise eest", - "referral": "Referral", + "referral": "Soovitaja", "referral_title": "Referral rewards", "referral_desc": "Invite friends and earn Points", "checkin_extra_title": "Kasutusboonus", @@ -43,7 +43,7 @@ "login_desc": "When you login into app first time you earn 100 points.", "checkin_extra_desc": "Consistent use of app gives you extra chances to earn more points, be more active and earn more.", "dropdown_transfer": "Kingi", - "dropdown_promote": "Promote", + "dropdown_promote": "Reklaami", "dropdown_boost": "Võimenda", "from": "Kellelt", "to": "Kellele", @@ -51,7 +51,7 @@ "estimated_value": "Estimated value", "estimated_amount": "Vote value", "amount_information": "Drag the slider to adjust the amount", - "amount": "Amount", + "amount": "Kogus", "memo": "Märge", "information": "Oled kindel, et soovid raha üle kanda?", "amount_desc": "Saldo", @@ -59,8 +59,8 @@ "to_placeholder": "Kasutajanimi", "memo_placeholder": "Enter your notes here", "transfer_token": "Ülekanne", - "purchase_estm": "GET POINTS", - "points": "Gift Points to someone", + "purchase_estm": "OSTA PUNKTE", + "points": "Kingi kellelegi punkte", "transfer_to_saving": "To Saving", "powerUp": "Lisa võimsust", "withdraw_to_saving": "Withdraw Saving", From 6c8a5d1ff1b847cc53b412a6fdb7a9c9485cb63a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 29 Dec 2020 17:17:06 +0200 Subject: [PATCH 233/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index a8897aa882..878003047a 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -57,7 +57,7 @@ "amount_desc": "Saldo", "memo_desc": "See märge on avalik", "to_placeholder": "Kasutajanimi", - "memo_placeholder": "Enter your notes here", + "memo_placeholder": "Jäta oma märkmed siia", "transfer_token": "Ülekanne", "purchase_estm": "OSTA PUNKTE", "points": "Kingi kellelegi punkte", From 0cc6376baa95263c20e162043884cc5cf12e9751 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 29 Dec 2020 21:56:46 +0200 Subject: [PATCH 234/505] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index ae219d3a84..235c78e5bf 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -256,9 +256,9 @@ "logout": "Odjavi se", "cancel": "Otkaži", "logout_text": "Da li ste sigurni da želite da se odjavite?", - "create_a_new_account": "Create a new account", - "add_an_existing_account": "Add an existing account", - "accounts": "Accounts" + "create_a_new_account": "Napravite novi nalog", + "add_an_existing_account": "Dodaj postojeći nalog", + "accounts": "Nalozi" }, "header": { "title": "Prijavite se kako biste prilagodili vaše novosti", From 8582437ab7021ead0055912b8f89ebd3c6623c38 Mon Sep 17 00:00:00 2001 From: feruzm Date: Tue, 29 Dec 2020 22:12:58 +0200 Subject: [PATCH 235/505] move hive.js inside dhive --- .../selectCommunityModalContainer.js | 2 +- src/providers/hive/dhive.js | 38 ++++++++++++++++++- src/redux/actions/communitiesAction.js | 7 +++- .../community/container/communityContainer.js | 3 +- .../container/communitiesContainer.js | 7 +++- 5 files changed, 49 insertions(+), 8 deletions(-) diff --git a/src/components/editorElements/selectCommunityModal/container/selectCommunityModalContainer.js b/src/components/editorElements/selectCommunityModal/container/selectCommunityModalContainer.js index 9d813851a2..6a830c79b7 100644 --- a/src/components/editorElements/selectCommunityModal/container/selectCommunityModalContainer.js +++ b/src/components/editorElements/selectCommunityModal/container/selectCommunityModalContainer.js @@ -3,7 +3,7 @@ import { useSelector, useDispatch } from 'react-redux'; import { debounce } from 'lodash'; // HIVE -import { getCommunities, getSubscriptions } from '../../../../providers/hive/hive'; +import { getCommunities, getSubscriptions } from '../../../../providers/hive/dhive'; import SelectCommunityModalView from '../view/selectCommunityModalView'; diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index 7793f3789f..db7ceea2a1 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -249,7 +249,7 @@ export const getUser = async (user, loggedIn = true) => { const cache = {}; const patt = /hive-\d\w+/g; -export const getCommunity = async (tag, observer = '') => +export const getCommunity = (tag, observer = '') => new Promise(async (resolve, reject) => { try { const community = await client.call('bridge', 'get_community', { @@ -294,6 +294,42 @@ export const getCommunityTitle = async (tag) => resolve(tag); }); +export const getCommunities = (last = '', limit = 100, query = '', sort = 'rank', observer = '') => + new Promise(async (resolve, reject) => { + try { + const data = await client.call('bridge', 'list_communities', { + last, + limit, + query, + sort, + observer, + }); + if (data) { + resolve(data); + } else { + resolve({}); + } + } catch (error) { + reject(error); + } + }); + +export const getSubscriptions = (account = '') => + new Promise(async (resolve, reject) => { + try { + const data = await client.call('bridge', 'list_all_subscriptions', { + account, + }); + if (data) { + resolve(data); + } else { + resolve({}); + } + } catch (error) { + reject(error); + } + }); + // TODO: Move to utils folder export const vestToSteem = async (vestingShares, totalVestingShares, totalVestingFundSteem) => ( diff --git a/src/redux/actions/communitiesAction.js b/src/redux/actions/communitiesAction.js index 9be3338249..e07c37de49 100644 --- a/src/redux/actions/communitiesAction.js +++ b/src/redux/actions/communitiesAction.js @@ -14,8 +14,11 @@ import { TOAST_NOTIFICATION, } from '../constants/constants'; -import { getCommunities, getSubscriptions } from '../../providers/hive/hive'; -import { subscribeCommunity as subscribeCommunityReq } from '../../providers/hive/dhive'; +import { + getCommunities, + getSubscriptions, + subscribeCommunity as subscribeCommunityReq, +} from '../../providers/hive/dhive'; // Fetch Communities export const fetchCommunities = (last, limit, query, sort, observer) => { diff --git a/src/screens/community/container/communityContainer.js b/src/screens/community/container/communityContainer.js index dbd7513584..8c11ebb1c8 100644 --- a/src/screens/community/container/communityContainer.js +++ b/src/screens/community/container/communityContainer.js @@ -3,8 +3,7 @@ import { withNavigation } from 'react-navigation'; import get from 'lodash/get'; import { connect } from 'react-redux'; -import { getCommunity, getSubscriptions } from '../../../providers/hive/hive'; -import { subscribeCommunity } from '../../../providers/hive/dhive'; +import { subscribeCommunity, getCommunity, getSubscriptions } from '../../../providers/hive/dhive'; import ROUTES from '../../../constants/routeNames'; diff --git a/src/screens/searchResult/container/communitiesContainer.js b/src/screens/searchResult/container/communitiesContainer.js index e3f65d20fa..bfbd4d9523 100644 --- a/src/screens/searchResult/container/communitiesContainer.js +++ b/src/screens/searchResult/container/communitiesContainer.js @@ -5,8 +5,11 @@ import isEmpty from 'lodash/isEmpty'; import ROUTES from '../../../constants/routeNames'; -import { getCommunities, getSubscriptions } from '../../../providers/hive/hive'; -import { subscribeCommunity } from '../../../providers/hive/dhive'; +import { + getCommunities, + getSubscriptions, + subscribeCommunity, +} from '../../../providers/hive/dhive'; const CommunitiesContainer = ({ children, From 8a9f3463bbc3dfd4b91d6d5f72d4851ef4f1c6a9 Mon Sep 17 00:00:00 2001 From: feruzm Date: Tue, 29 Dec 2020 22:14:17 +0200 Subject: [PATCH 236/505] rm hive.js --- src/providers/hive/hive.js | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 src/providers/hive/hive.js diff --git a/src/providers/hive/hive.js b/src/providers/hive/hive.js deleted file mode 100644 index a8f62a41d3..0000000000 --- a/src/providers/hive/hive.js +++ /dev/null @@ -1,33 +0,0 @@ -import axios from 'axios'; -import { SERVER_LIST } from '../../constants/options/api'; - -const DEFAULT_SERVER = SERVER_LIST; - -const pickAServer = () => DEFAULT_SERVER.sort(() => 0.5 - Math.random())[0]; - -const bridgeApiCall = (endpoint, params) => - axios - .post(pickAServer(), { - jsonrpc: '2.0', - method: endpoint, - params: params, - id: 1, - }) - .then((resp) => { - return resp.data.result || null; - }); - -export const getCommunity = (name, observer = '') => - bridgeApiCall('bridge.get_community', { name, observer }); - -export const getCommunities = (last = '', limit = 100, query = '', sort = 'rank', observer = '') => - bridgeApiCall('bridge.list_communities', { - last, - limit, - query, - sort, - observer, - }); - -export const getSubscriptions = (account = '') => - bridgeApiCall('bridge.list_all_subscriptions', { account }); From 334b241aee3e71cd72b03edd221bb58b4b74550e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Tue, 29 Dec 2020 23:16:29 +0300 Subject: [PATCH 237/505] Relocate inputs from editorScreen to markdownEditorView and add ScrollView --- .../view/selectCommunityAreStyles.js | 2 +- .../view/selectCommunityAreaView.js | 1 + .../view/selectCommunityModalView.js | 5 +- .../markdownEditor/view/markdownEditorView.js | 88 +++++++++++++------ .../posts/container/postsContainer.js | 2 +- src/screens/editor/screen/editorScreen.js | 34 ++++--- 6 files changed, 83 insertions(+), 49 deletions(-) diff --git a/src/components/editorElements/selectCommunityArea/view/selectCommunityAreStyles.js b/src/components/editorElements/selectCommunityArea/view/selectCommunityAreStyles.js index 5b464f35dd..9997c7638b 100644 --- a/src/components/editorElements/selectCommunityArea/view/selectCommunityAreStyles.js +++ b/src/components/editorElements/selectCommunityArea/view/selectCommunityAreStyles.js @@ -4,7 +4,7 @@ export default EStyleSheet.create({ selectCommunityAreaViewContainer: { alignItems: 'center', flexDirection: 'row', - paddingVertical: 4, + paddingVertical: 8, }, chooseACommunityText: { marginHorizontal: 8, diff --git a/src/components/editorElements/selectCommunityArea/view/selectCommunityAreaView.js b/src/components/editorElements/selectCommunityArea/view/selectCommunityAreaView.js index c0eb2d55d5..d816bd519f 100644 --- a/src/components/editorElements/selectCommunityArea/view/selectCommunityAreaView.js +++ b/src/components/editorElements/selectCommunityArea/view/selectCommunityAreaView.js @@ -7,6 +7,7 @@ import { Icon } from '../../../icon'; import globalStyles from '../../../../globalStyles'; import styles from './selectCommunityAreStyles'; +import { Separator } from '../../../basicUIElements'; const SelectCommunityAreaView = ({ community, diff --git a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js index c35001a70c..28951533c9 100644 --- a/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js +++ b/src/components/editorElements/selectCommunityModal/view/selectCommunityModalView.js @@ -57,7 +57,7 @@ const SelectCommunityModalView = ({ /> {!subscribedCommunities.loading && !subscribedCommunities.error && - subscribedCommunities.data.length > 0 && ( + subscribedCommunities.data?.length > 0 && ( {intl.formatMessage({ id: 'editor.my_communities' }).toUpperCase()} @@ -80,10 +80,9 @@ const SelectCommunityModalView = ({ /> )} - {!topCommunities.loading && !topCommunities.error && topCommunities.data.length > 0 && ( + {!topCommunities.loading && !topCommunities.error && topCommunities.data?.length > 0 && ( - {' '} {intl.formatMessage({ id: 'editor.top_communities' }).toUpperCase()} { const [text, setText] = useState(draftBody || ''); const [selection, setSelection] = useState({ start: 0, end: 0 }); @@ -220,32 +228,60 @@ const MarkdownEditorView = ({ keyboardVerticalOffset={Platform.select({ ios: 0, android: 30 })} behavior={Platform.OS === 'ios' ? 'padding' : 'height'} > - {!isPreviewActive ? ( - - {({ isDarkTheme }) => ( - - )} - - ) : ( - _renderPreview() - )} + + {isReply && !isEdit && } + {!isReply && ( + + )} + {!isReply && !isPreviewActive && ( + + )} + {!isReply && isPreviewActive && ( + 0 ? fields.tags : null} + componentID="tag-area" + intl={intl} + /> + )} + {!isPreviewActive ? ( + + {({ isDarkTheme }) => ( + + )} + + ) : ( + _renderPreview() + )} + {!isPreviewActive && _renderEditorButtons()} { if (!communities.loading) { - if (!communities.error && communities.data.length > 0) { + if (!communities.error && communities.data?.length > 0) { _formatRecommendedCommunities(communities.data); } } diff --git a/src/screens/editor/screen/editorScreen.js b/src/screens/editor/screen/editorScreen.js index ebe3c18f7e..e9e20abd16 100644 --- a/src/screens/editor/screen/editorScreen.js +++ b/src/screens/editor/screen/editorScreen.js @@ -213,6 +213,16 @@ class EditorScreen extends Component { }); }; + _handleChangeTitle = (text) => { + const { fields: _fields } = this.state; + + _fields.title = text; + + this.setState({ fields: _fields }, () => { + this._handleFormUpdate('title', _fields.title); + }); + }; + _handlePressCommunity = (community) => { const { fields, selectedCommunity } = this.state; @@ -322,24 +332,6 @@ class EditorScreen extends Component { onPressIn={() => this.setState({ isCommunitiesListModalOpen: false })} /> )} - {isReply && !isEdit && } - {!isReply && } - {!isReply && !isPreviewActive && ( - this._getCommunity(hive)} - /> - )} - {!isReply && isPreviewActive && ( - 0 ? fields.tags : null} - componentID="tag-area" - intl={intl} - /> - )} From 452baf599fe06b2a59f9687c7c9a6c9a71ab4f2a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 30 Dec 2020 21:36:57 +0200 Subject: [PATCH 238/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 878003047a..f24c7173ae 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -65,7 +65,7 @@ "powerUp": "Lisa võimsust", "withdraw_to_saving": "Withdraw Saving", "steemconnect_title": "Hivesigner Transfer", - "next": "NEXT", + "next": "EDASI", "delegate": "Delegate", "power_down": "Väljaluülitus", "withdraw_steem": "Withdraw HIVE", @@ -83,7 +83,7 @@ "fill_vesting_withdraw": "PowerDown executed", "estm": { "title": "Punktid", - "buy": "GET POINTS" + "buy": "OSTA PUNKTE" }, "savingsteem": { "title": "HIVE Hoius" From e59a0b321766c6f4b1b8a0f47941a462aab46772 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 30 Dec 2020 21:46:47 +0200 Subject: [PATCH 239/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index f24c7173ae..280d26a0a1 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -104,23 +104,23 @@ }, "btc": { "title": "BTC", - "buy": "GET BTC", + "buy": "OSTA BTC", "address": "RECEIVE" } }, "notification": { - "vote": "voted", - "unvote": "unvoted", + "vote": "hääletatud", + "unvote": "hääl eemaldatud", "reply": "replied to", - "mention": "mentioned in", + "mention": "mainis", "follow": "hakkas sind jälgima", "unfollow": "enam ei jälgi sind", "ignore": "ignoreeris sind", - "reblog": "reblogged", - "transfer": "transferred", - "spin": "Time to earn more Points", - "inactive": "Be active! Write a post, continue earning", - "referral": "joined with your referral, welcome them", + "reblog": "jagatud", + "transfer": "ülekanne tehtud", + "spin": "Aeg teenida rohkem Punkte", + "inactive": "Ole aktiivne! Postita, jätka teenimist", + "referral": "liitus sinu kutsega, tervita neid", "notification": "Teavitused", "leaderboard": "Edetabel", "epoint": "Punktid", @@ -224,10 +224,10 @@ "steemconnect_fee_description": "info" }, "register": { - "button": "Sign Up", + "button": "Loo konto", "title": "Loo kasutaja", - "username": "Pick a username", - "mail": "Enter your email address", + "username": "Vali kasutajanimi", + "mail": "Kirjuta oma e-posti aadress", "ref_user": "Referred user (Optional)", "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", "title_description": "One account to manage everything", From 421579424cf6435d05c0a9f030b10aca60cde224 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 30 Dec 2020 21:56:21 +0200 Subject: [PATCH 240/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 280d26a0a1..de6674d459 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -194,7 +194,7 @@ "pincode": "Pincode", "reset_pin": "Reset Pin Code", "reset": "Algseisundi Taastamine", - "nsfw_content": "NSFW", + "nsfw_content": "18+", "send_feedback": "Saada Tagasisidet", "send": "Saada", "default_footer": "Vaikimisi Jaluts", @@ -205,7 +205,7 @@ }, "feedback_success": "Email edukalt avatud", "feedback_fail": "Emaili rakendus ei avanenud", - "server_fail": "Server not available" + "server_fail": "Server pole kättesaadav" }, "voters": { "voters_info": "Hääletaja info", @@ -213,8 +213,8 @@ }, "login": { "signin": "Logi sisse", - "signup": "JOIN NOW", - "signin_title": "To get all the benefits of using Ecency", + "signup": "LIITU NÜÜD", + "signin_title": "Et saada osa kõikidest Ecency funktsioonidest", "username": "Kasutajanimi", "password": "Parool või WIF", "description": "By signing in, you agree to our Terms of Services and Privacy Policies.", @@ -228,21 +228,21 @@ "title": "Loo kasutaja", "username": "Vali kasutajanimi", "mail": "Kirjuta oma e-posti aadress", - "ref_user": "Referred user (Optional)", + "ref_user": "Kutsutud kasutaja (Vabatahtlik)", "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", - "title_description": "One account to manage everything", + "title_description": "Üks kasutaja kõige haldamiseks", "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." }, "home": { "feed": "Sein", "popular": "Populaarne", "top": "Top", - "hot": "Hot", - "new": "New", - "blog": "Blog", + "hot": "Kuum", + "new": "Uus", + "blog": "Blogi", "posts": "Post", - "friends": "Friends", - "communities": "Communities" + "friends": "Sõbrad", + "communities": "Kogukonnad" }, "side_menu": { "profile": "Profiil", @@ -256,8 +256,8 @@ "logout": "Logi välja", "cancel": "Tühista", "logout_text": "Oled kindel, et soovid välja logida?", - "create_a_new_account": "Create a new account", - "add_an_existing_account": "Add an existing account", + "create_a_new_account": "Registreeri uus kasutaja", + "add_an_existing_account": "Lisa olemasolev kasutaja", "accounts": "Accounts" }, "header": { @@ -285,19 +285,19 @@ "limited_space": "Use space to separate tags", "limited_lowercase": "Only use lower letters in tag", "limited_characters": "Use only lowercase letters, digits and one dash", - "limited_firstchar": "Tag must start with a letter", - "limited_lastchar": "Tag must end with letter or number", - "setting_schedule": "Scheduling Time", - "setting_reward": "Reward", - "setting_beneficiary": "Beneficiary", - "reward_default": "Default 50% / 50%", - "reward_power_up": "Power Up 100%", - "reward_decline": "Decline Payout", - "beneficiaries": "Beneficiaries", - "options": "Options", - "my_blog": "My Blog", - "my_communities": "My Communities", - "top_communities": "Top Communities" + "limited_firstchar": "Silt peab algama tähega", + "limited_lastchar": "Silt peab lõppema tähe või numbriga", + "setting_schedule": "Ajasta", + "setting_reward": "Tasu", + "setting_beneficiary": "Kasusaaja", + "reward_default": "Vaikimisi 50% / 50%", + "reward_power_up": "Lisa võimsust 100%", + "reward_decline": "Keeldu väljamaksest", + "beneficiaries": "Kasusaajad", + "options": "Valikud", + "my_blog": "Minu blogi", + "my_communities": "Minu kogukonnad", + "top_communities": "Top kogukonnad" }, "pincode": { "enter_text": "Enter pin to unlock", @@ -313,7 +313,7 @@ "fail": "Ebaõnnestumine!", "move": "Liiguta", "move_question": "Oled sa kindel, et soovid mustanditesse teisaldada?", - "success_shared": "Success! Content submitted!", + "success_shared": "Valmis! Sisu esitatud!", "success_moved": "Teisaldatud mustanditesse", "permission_denied": "Juurdepääs keelatud", "permission_text": "Please, go to phone Settings and change Ecency app permissions.", From e10940cf7d309dad4c92d6c077b35cf48c337d77 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 30 Dec 2020 22:06:16 +0200 Subject: [PATCH 241/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index de6674d459..7c0f9a80e0 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -170,9 +170,9 @@ "savings": "Säästud", "edit": { "display_name": "Display Name", - "about": "About", - "location": "Location", - "website": "Website" + "about": "Teave", + "location": "Asukoht", + "website": "Koduleht" } }, "settings": { @@ -192,7 +192,7 @@ "transfers": "Ülekanded" }, "pincode": "Pincode", - "reset_pin": "Reset Pin Code", + "reset_pin": "Lähtesta Pin-kood", "reset": "Algseisundi Taastamine", "nsfw_content": "18+", "send_feedback": "Saada Tagasisidet", @@ -258,7 +258,7 @@ "logout_text": "Oled kindel, et soovid välja logida?", "create_a_new_account": "Registreeri uus kasutaja", "add_an_existing_account": "Lisa olemasolev kasutaja", - "accounts": "Accounts" + "accounts": "Kasutajad" }, "header": { "title": "Logi sisse, et kohandada oma voogu", @@ -272,19 +272,19 @@ }, "editor": { "title": "Pealkiri", - "tags": "Tags (separate with space)", - "default_placeholder": "Tell us something...", - "reply_placeholder": "Add your reply...", + "tags": "Sildid (eralda tühikuga)", + "default_placeholder": "Kirjuta midagi...", + "reply_placeholder": "Vasta...", "publish": "Avalda", "reply": "Vasta", "open_gallery": "Ava Galerii", "capture_photo": "Tee pilti", - "limited_tags": "Only 10 tags allowed, remove some", - "limited_length": "Maximum length of each tag should be 24", - "limited_dash": "Use one dash in each tag", + "limited_tags": "10 silti lubatud, eemalda mõned", + "limited_length": "Sildi maksimum pikkus võib olla 24", + "limited_dash": "Kasuta ühte kriipsu igas sildis", "limited_space": "Use space to separate tags", - "limited_lowercase": "Only use lower letters in tag", - "limited_characters": "Use only lowercase letters, digits and one dash", + "limited_lowercase": "Kasuta siltides ainult väiketähti", + "limited_characters": "Kasuta ainult väiketähti, numbreid ja ühte kriipsu", "limited_firstchar": "Silt peab algama tähega", "limited_lastchar": "Silt peab lõppema tähe või numbriga", "setting_schedule": "Ajasta", @@ -320,24 +320,24 @@ "key_warning": "Operation requires active key or master password, please relogin!", "success_rebloged": "Rebloged!", "already_rebloged": "Sa oled seda juba jaganud!", - "success_favorite": "Favorite added!", - "success_unfavorite": "Favorite removed!", - "success_follow": "Follow success!", - "fail_follow": "Follow failed!", - "success_subscribe": "Subscribe success!", - "fail_subscribe": "Subscribe failed!", - "success_leave": "Leave success!", - "fail_leave": "Leave failed!", - "success_mute": "Mute success!", - "success_unmute": "Unmute success!", - "success_unfollow": "Unfollow success!", - "fail_unfollow": "Unfollow failed!", + "success_favorite": "Lisatud lemmikuks!", + "success_unfavorite": "Lemmik eemaldatud!", + "success_follow": "Jälgimine õnnestus!", + "fail_follow": "Jälgimine ebaõnnestus!", + "success_subscribe": "Tellimine õnnestus!", + "fail_subscribe": "Tellimine ebaõnnestus!", + "success_leave": "Lahkumine õnnestus!", + "fail_leave": "Lahkumine ebaõnnestus!", + "success_mute": "Vaigistamine õnnestus!", + "success_unmute": "Vaigistamine tühistatud!", + "success_unfollow": "Jälgimine eemaldatud!", + "fail_unfollow": "Jälgimise eemaldamine ebaõnnestus!", "warning": "Hoiatus", "invalid_pincode": "Invalid pin code, please check and try again.", "remove_alert": "Are you sure want to remove?", "clear_alert": "Are you sure you want to clear?", "clear_user_alert": "Are you sure you want to clear all user data?", - "clear": "Clear", + "clear": "Tühjenda", "cancel": "Tühista", "delete": "Kustuta", "copied": "Kopeeritud!", @@ -350,16 +350,16 @@ "fetch_error": "Connection issue, change server and restart", "connection_fail": "Ühendus nurjus!", "connection_success": "Edukalt ühendatud!", - "checking": "Checking...", - "external_link": "Open in Browser", + "checking": "Kontrollin...", + "external_link": "Ava veebilehitsejas", "not_existing_post": "The post does not exist! Please check permlink and author.", "google_play_version": "We noticed that your device has old version of Google Play. Please update Google Play services and try again!", "rc_down": "Not enough resource credits to perform an action! \n\nBoost your account to continue enjoy the experience. Do you want to boost your account, now?", "payloadTooLarge": "File size too big, please resize or upload smaller image", "qoutaExceeded": "Upload quota exceeded", "invalidImage": "Invalid image, try different file", - "something_wrong": "Something went wrong.", - "something_wrong_alt": "Try https://ecency.com", + "something_wrong": "Midagi läks valesti.", + "something_wrong_alt": "Proovi https://ecency.com", "something_wrong_reload": "Reload" }, "post": { @@ -445,7 +445,7 @@ }, "comment_filter": { "trending": "TOP", - "reputation": "REPUTATION", + "reputation": "MAINE", "votes": "VOTE", "age": "AGE", "top": "TOP", From 65117bb8ab45ae39d72dadfac4fcbe05a2d06c83 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 30 Dec 2020 22:16:22 +0200 Subject: [PATCH 242/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 66 +++++++++++++++++------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 7c0f9a80e0..633e16edbf 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -420,20 +420,20 @@ "promoted": "Promoted", "author_payout": "Author Payout", "curation_payout": "Curation Payout", - "payout_date": "Payout", - "beneficiaries": "Beneficiaries", - "warn_zero_payout": "Amount must reach $0.02 for payout", + "payout_date": "Väljamakse", + "beneficiaries": "Kasusaajad", + "warn_zero_payout": "Kogus peab väljamakseks olema vähemalt $0.02", "breakdown": "Breakdown" }, "post_dropdown": { - "copy": "copy link", - "reblog": "reblog", - "reply": "reply", - "share": "share", - "bookmarks": "add to bookmarks", + "copy": "kopeeri link", + "reblog": "jaga", + "reply": "vasta", + "share": "jaga", + "bookmarks": "lisa järjehoidjatesse", "promote": "reklaami", "boost": "võimenda", - "report": "report" + "report": "teavita" }, "deep_link": { "no_existing_user": "Kasutaja ei eksisteeri", @@ -446,23 +446,23 @@ "comment_filter": { "trending": "TOP", "reputation": "MAINE", - "votes": "VOTE", - "age": "AGE", + "votes": "HÄÄL", + "age": "VANUS", "top": "TOP", - "time": "TIME" + "time": "AEG" }, "transfer": { "from": "Kellelt", "to": "Kellele", "amount_information": "Drag the slider to adjust the amount", - "amount": "Amount", + "amount": "Kogus", "memo": "Märge", "information": "Oled kindel, et soovid raha üle kanda?", "amount_desc": "Saldo", "memo_desc": "See märge on avalik", "convert_desc": "Convert takes 3.5 days and NOT recommended IF HBD price is higher than $1", "to_placeholder": "Kasutajanimi", - "memo_placeholder": "Enter your notes here", + "memo_placeholder": "Jäta oma märkmed siia", "transfer_token": "Ülekanne", "purchase_estm": "Purchase Points", "convert": "Convert HBD to HIVE", @@ -476,23 +476,23 @@ "stop_information": "Are you sure want to stop?", "percent": "Percent", "auto_vests": "Auto Vests", - "save": "SAVE", + "save": "SALVESTA", "percent_information": "Percent info", - "next": "NEXT", + "next": "EDASI", "delegate": "Delegate", "power_down": "Power Down", - "withdraw_steem": "Withdraw HIVE", - "withdraw_sbd": "Withdraw HIVE Dollar", - "incoming_funds": "Incoming Funds", - "stop": "Stop", - "address_view": "View address" + "withdraw_steem": "Võta HIVE välja", + "withdraw_sbd": "Võta HIVE Dollar välja", + "incoming_funds": "Sissetulevad varad", + "stop": "Peata", + "address_view": "Näita aadressi" }, "boost": { - "title": "Get Points", - "buy": "GET Points", - "next": "NEXT", + "title": "Osta Punkte", + "buy": "OSTA Punkte", + "next": "EDASI", "account": { - "title": "Get Account Boost", + "title": "Võimenda kasutajat", "desc": "30 days delegation will boost your votes and social activities and give you more actions with more Resource Credits." } }, @@ -542,22 +542,22 @@ "subscribe": "Join", "unsubscribe": "Leave", "subscribers": "Members", - "posters": "Posters", + "posters": "Postitajad", "posts": "Post" }, "communities_filter": { - "my": "My Communities", - "rank": "Rank", - "subs": "Members", - "new": "New" + "my": "Minu Kogukonnad", + "rank": "Tase", + "subs": "Liikmed", + "new": "Uus" }, "post_result_filter": { - "popularity": "Popularity", - "newest": "Newest", + "popularity": "Populaarsus", + "newest": "Uusim", "relevance": "Relevance" }, "other_result_filter": { - "user": "User", + "user": "Kasutaja", "tag": "Tag" } }, From e830d589a6ec08f49a877e89eaf8b3c2343eae63 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 30 Dec 2020 22:26:08 +0200 Subject: [PATCH 243/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 633e16edbf..0dacd9cee2 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -93,11 +93,11 @@ }, "steem": { "title": "HIVE", - "buy": "GET HIVE" + "buy": "OSTA HIVE" }, "sbd": { "title": "HBD", - "buy": "GET HBD" + "buy": "OSTA HBD" }, "steem_power": { "title": "HIVE POWER" @@ -554,20 +554,20 @@ "post_result_filter": { "popularity": "Populaarsus", "newest": "Uusim", - "relevance": "Relevance" + "relevance": "Asjakohasus" }, "other_result_filter": { "user": "Kasutaja", - "tag": "Tag" + "tag": "Silt" } }, "community": { - "new_post": "New Post", - "community": "community", - "details": "Details" + "new_post": "Uus postitus", + "community": "kogukond", + "details": "Üksikasjad" }, "user": { - "follow": "Follow", - "unfollow": "Unfollow" + "follow": "Jälgi", + "unfollow": "Lõpeta jälgimine" } } From c9f0a4e4005e754e4e8a0fc3cbea6bace9aad09d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 4 Jan 2021 10:26:42 +0200 Subject: [PATCH 244/505] New translations en-US.json (Spanish, Argentina) --- src/config/locales/es-AR.json | 573 ++++++++++++++++++++++++++++++++++ 1 file changed, 573 insertions(+) create mode 100644 src/config/locales/es-AR.json diff --git a/src/config/locales/es-AR.json b/src/config/locales/es-AR.json new file mode 100644 index 0000000000..2fa5ae0caa --- /dev/null +++ b/src/config/locales/es-AR.json @@ -0,0 +1,573 @@ +{ + "wallet": { + "curation_reward": "Curation Reward", + "author_reward": "Author Reward", + "comment_benefactor_reward": "Benefactor Reward", + "claim_reward_balance": "Claim Reward ", + "transfer": "Transfer", + "transfer_to_vesting": "To Vesting", + "transfer_from_savings": "From Savings", + "withdraw_vesting": "Power Down", + "fill_order": "Fill Order", + "post": "Post", + "comment": "Comment", + "checkin": "Check-in", + "vote": "Vote", + "reblog": "Reblog", + "login": "Login", + "incoming_transfer_title": "Incoming transfer", + "outgoing_transfer_title": "Outgoing transfer", + "checkin_extra": "Bonus", + "delegation": "Delegation", + "delegations": "Delegations", + "delegation_title": "Delegation reward", + "delegation_desc": "Earn Points everyday for delegation", + "post_title": "Points for post", + "comment_title": "Points for comment", + "vote_title": "Points for vote", + "reblog_title": "Points for reblog", + "login_title": "Points for login", + "checkin_title": "Points for heartbeat", + "referral": "Referral", + "referral_title": "Referral rewards", + "referral_desc": "Invite friends and earn Points", + "checkin_extra_title": "Usage bonus", + "no_activity": "No recent activity", + "outgoing_transfer_description": "", + "incoming_transfer_description": "", + "post_desc": "You can earn point by posting regularly. Posting gives you upto 15 points.", + "comment_desc": "Each comment you make helps you to grow your audience and also earns you upto 5 points.", + "checkin_desc": "Checking in regularly gives you 0.25 points.", + "vote_desc": "By voting you give reward to other creators and also earn back upto 0.01 x vote weight points.", + "reblog_desc": "Share what post you like with your friends and earn points.", + "login_desc": "When you login into app first time you earn 100 points.", + "checkin_extra_desc": "Consistent use of app gives you extra chances to earn more points, be more active and earn more.", + "dropdown_transfer": "Gift", + "dropdown_promote": "Promote", + "dropdown_boost": "Boost", + "from": "From", + "to": "To", + "estimated_value_desc": "According to purchase value", + "estimated_value": "Estimated value", + "estimated_amount": "Vote value", + "amount_information": "Drag the slider to adjust the amount", + "amount": "Amount", + "memo": "Memo", + "information": "Are you sure to transfer funds?", + "amount_desc": "Balance", + "memo_desc": "This memo is public", + "to_placeholder": "Username", + "memo_placeholder": "Enter your notes here", + "transfer_token": "Transfer", + "purchase_estm": "GET POINTS", + "points": "Gift Points to someone", + "transfer_to_saving": "To Saving", + "powerUp": "Power Up", + "withdraw_to_saving": "Withdraw Saving", + "steemconnect_title": "Hivesigner Transfer", + "next": "NEXT", + "delegate": "Delegate", + "power_down": "Power Down", + "withdraw_steem": "Withdraw HIVE", + "withdraw_sbd": "Withdraw HBD", + "transfer_to_savings": "To Savings", + "convert": "Convert", + "escrow_transfer": "Escrow Transfer", + "escrow_dispute": "Escrow Dispute", + "escrow_release": "Escrow Release", + "escrow_approve": "Escrow Approve", + "cancel_transfer_from_savings": "Cancel From Savings", + "delegate_vesting_shares": "Delegation", + "fill_convert_request": "Convert Executed", + "fill_transfer_from_savings": "Savings Executed", + "fill_vesting_withdraw": "PowerDown executed", + "estm": { + "title": "Points", + "buy": "GET POINTS" + }, + "savingsteem": { + "title": "HIVE Savings" + }, + "savingsbd": { + "title": "HBD Savings" + }, + "steem": { + "title": "HIVE", + "buy": "GET HIVE" + }, + "sbd": { + "title": "HBD", + "buy": "GET HBD" + }, + "steem_power": { + "title": "HIVE POWER" + }, + "btc": { + "title": "BTC", + "buy": "GET BTC", + "address": "RECEIVE" + } + }, + "notification": { + "vote": "voted", + "unvote": "unvoted", + "reply": "replied to", + "mention": "mentioned in", + "follow": "followed you", + "unfollow": "unfollowed you", + "ignore": "ignored you", + "reblog": "reblogged", + "transfer": "transferred", + "spin": "Time to earn more Points", + "inactive": "Be active! Write a post, continue earning", + "referral": "joined with your referral, welcome them", + "notification": "Notifications", + "leaderboard": "Leaderboard", + "epoint": "Points", + "leaderboard_title": "Top Users", + "recent": "Recent", + "yesterday": "Yesterday", + "this_week": "This Week", + "this_month": "This Month", + "older_then": "Older Than A Month", + "activities": "All", + "replies": "Replies", + "mentions": "Mentions", + "reblogs": "Reblogs", + "noactivity": "No recent activity" + }, + "leaderboard": { + "daily": "DAILY", + "weekly": "WEEKLY", + "monthly": "MONTHLY" + }, + "messages": { + "comingsoon": "Messages feature is coming soon!" + }, + "profile": { + "following": "Following", + "follower": "Follower", + "post": "Posts", + "details": "Profile Details", + "comments": "Comments", + "replies": "Replies", + "wallet": "Wallet", + "wallet_details": "Wallet Details", + "unclaimed_rewards": "Unclaimed Rewards", + "full_in": "Full in", + "hours": "hours", + "voting_power": "Voting power", + "login_to_see": "Login to see", + "follow_people": "Follow some people to fill your feed", + "follow_communities": "Join some communities to fill your feed", + "havent_commented": "haven't commented anything yet", + "havent_posted": "haven't posted anything yet", + "steem_power": "Hive Power", + "next_power_text": "Next power down is in", + "days": "days", + "day": "day", + "steem_dollars": "Hive Dollars", + "savings": "Savings", + "edit": { + "display_name": "Display Name", + "about": "About", + "location": "Location", + "website": "Website" + } + }, + "settings": { + "settings": "Settings", + "general": "General", + "currency": "Currency", + "language": "Language", + "server": "Server", + "dark_theme": "Dark Theme", + "push_notification": "Push Notification", + "notification": { + "follow": "Follow", + "vote": "Vote", + "comment": "Comment", + "mention": "Mention", + "reblog": "Reblog", + "transfers": "Transfers" + }, + "pincode": "PIN code", + "reset_pin": "Reset Pin Code", + "reset": "Reset", + "nsfw_content": "NSFW", + "send_feedback": "Send Feedback", + "send": "Send", + "default_footer": "Default Footer", + "nsfw": { + "always_show": "Always show", + "always_hide": "Always hide", + "always_warn": "Always warn" + }, + "feedback_success": "Email successfully open", + "feedback_fail": "Email client could not open", + "server_fail": "Server not available" + }, + "voters": { + "voters_info": "Voters Info", + "no_user": "User is not found." + }, + "login": { + "signin": "Sign in", + "signup": "JOIN NOW", + "signin_title": "To get all the benefits of using Ecency", + "username": "Username", + "password": "Password or WIF", + "description": "By signing in, you agree to our Terms of Services and Privacy Policies.", + "cancel": "cancel", + "login": "LOGIN", + "steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Hivesigner.", + "steemconnect_fee_description": "info" + }, + "register": { + "button": "Sign Up", + "title": "Sign up", + "username": "Pick a username", + "mail": "Enter your email address", + "ref_user": "Referred user (Optional)", + "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", + "title_description": "One account to manage everything", + "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." + }, + "home": { + "feed": "Feed", + "popular": "Popular", + "top": "Top", + "hot": "Hot", + "new": "New", + "blog": "Blog", + "posts": "Posts", + "friends": "Friends", + "communities": "Communities" + }, + "side_menu": { + "profile": "Profile", + "bookmarks": "Bookmarks", + "favorites": "Favorites", + "drafts": "Drafts", + "schedules": "Schedules", + "gallery": "Gallery", + "settings": "Settings", + "add_account": "Add Account", + "logout": "Logout", + "cancel": "Cancel", + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" + }, + "header": { + "title": "Login to customize your feed", + "search": "Search..." + }, + "basic_header": { + "publish": "Publish", + "search": "Search", + "update": "Update", + "reply": "Reply" + }, + "editor": { + "title": "Title", + "tags": "Tags (separate with space)", + "default_placeholder": "Tell us something...", + "reply_placeholder": "Add your reply...", + "publish": "Publish", + "reply": "Reply", + "open_gallery": "Open Gallery", + "capture_photo": "Capture a photo", + "limited_tags": "Only 10 tags allowed, remove some", + "limited_length": "Maximum length of each tag should be 24", + "limited_dash": "Use one dash in each tag", + "limited_space": "Use space to separate tags", + "limited_lowercase": "Only use lower letters in tag", + "limited_characters": "Use only lowercase letters, digits and one dash", + "limited_firstchar": "Tag must start with a letter", + "limited_lastchar": "Tag must end with letter or number", + "setting_schedule": "Scheduling Time", + "setting_reward": "Reward", + "setting_beneficiary": "Beneficiary", + "reward_default": "Default 50% / 50%", + "reward_power_up": "Power Up 100%", + "reward_decline": "Decline Payout", + "beneficiaries": "Beneficiaries", + "options": "Options", + "my_blog": "My Blog", + "my_communities": "My Communities", + "top_communities": "Top Communities" + }, + "pincode": { + "enter_text": "Enter PIN to unlock", + "set_new": "Set new PIN", + "write_again": "Write again", + "forgot_text": "Oh, I forgot it..." + }, + "alert": { + "success": "Success!", + "successful": "Successful", + "allRead": "Marked all notifications as read", + "claim_reward_balance_ok": "Reward balance claimed", + "fail": "Fail!", + "move": "Move", + "move_question": "Are you sure to move to drafts?", + "success_shared": "Success! Content submitted!", + "success_moved": "Moved to draft", + "permission_denied": "Permission denied", + "permission_text": "Please, go to phone Settings and change Ecency app permissions.", + "key_warning": "Operation requires active key or master password, please relogin!", + "success_rebloged": "Reblogged!", + "already_rebloged": "You have already reblogged!", + "success_favorite": "Favorite added!", + "success_unfavorite": "Favorite removed!", + "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", + "success_mute": "Mute success!", + "success_unmute": "Unmute success!", + "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", + "warning": "Warning", + "invalid_pincode": "Invalid PIN code, please check and try again.", + "remove_alert": "Are you sure you want to remove?", + "clear_alert": "Are you sure you want to clear?", + "clear_user_alert": "Are you sure you want to clear all user data?", + "clear": "Clear", + "cancel": "Cancel", + "delete": "Delete", + "copied": "Copied!", + "no_internet": "No connection!", + "confirm": "Confirm", + "removed": "Removed", + "same_user": "This user already added to list", + "unknow_error": "An error occurred", + "error": "Error", + "fetch_error": "Connection issue, change server and restart", + "connection_fail": "Connection Failed!", + "connection_success": "Successfully connected!", + "checking": "Checking...", + "external_link": "Open in Browser", + "not_existing_post": "The post does not exist! Please check permlink and author.", + "google_play_version": "We noticed that your device has old version of Google Play. Please update Google Play services and try again!", + "rc_down": "Not enough resource credits to perform an action! \n\nBoost your account to continue enjoy the experience. Do you want to boost your account, now?", + "payloadTooLarge": "File size too big, please resize or upload smaller image", + "qoutaExceeded": "Upload quota exceeded", + "invalidImage": "Invalid image, try different file", + "something_wrong": "Something went wrong.", + "something_wrong_alt": "Try https://ecency.com", + "something_wrong_reload": "Reload" + }, + "post": { + "reblog_alert": "Are you sure, you want to reblog?", + "removed_hint": "Content is not available", + "copy_link": "Copy link", + "reblogged": "reblogged by", + "sponsored": "SPONSORED", + "open_thread": "Open thread", + "image": "Image", + "link": "Link", + "gallery_mode": "Gallery mode", + "save_to_local": "Download to device", + "image_saved": "Image saved to Photo Gallery", + "image_saved_error": "Error Saving Image", + "wrong_link": "Wrong link" + }, + "drafts": { + "title": "Drafts", + "load_error": "Could not load drafts", + "empty_list": "Nothing here", + "deleted": "Draft deleted" + }, + "schedules": { + "title": "Schedules", + "empty_list": "Nothing here", + "deleted": "Scheduled post deleted", + "move": "Move to drafts", + "moved": "Moved to drafts" + }, + "bookmarks": { + "title": "Bookmarks", + "load_error": "Could not load bookmarks", + "empty_list": "Nothing here", + "deleted": "Bookmark removed", + "search": "Search in bookmarks", + "added": "Added to bookmarks", + "add": "Add to bookmarks" + }, + "report": { + "added": "Reported objectionable content" + }, + "favorites": { + "title": "Favorites", + "load_error": "Could not load favorites", + "empty_list": "Nothing here", + "search": "Search in favorites" + }, + "auth": { + "invalid_pin": "Invalid PIN code, please check and try again", + "invalid_username": "Invalid username, please check and try again", + "already_logged": "You are already logged in, please try to add another account", + "invalid_credentials": "Invalid credentials, please check and try again", + "unknow_error": "Unknown error, please write to support@ecency.com" + }, + "payout": { + "potential_payout": "Potential Payout", + "promoted": "Promoted", + "author_payout": "Author Payout", + "curation_payout": "Curation Payout", + "payout_date": "Payout", + "beneficiaries": "Beneficiaries", + "warn_zero_payout": "Amount must reach $0.02 for payout", + "breakdown": "Breakdown" + }, + "post_dropdown": { + "copy": "copy link", + "reblog": "reblog", + "reply": "reply", + "share": "share", + "bookmarks": "add to bookmarks", + "promote": "promote", + "boost": "boost", + "report": "report" + }, + "deep_link": { + "no_existing_user": "No existing user", + "no_existing_post": "No existing post" + }, + "search": { + "posts": "Posts", + "comments": "Comments" + }, + "comment_filter": { + "trending": "TOP", + "reputation": "REPUTATION", + "votes": "VOTE", + "age": "AGE", + "top": "TOP", + "time": "TIME" + }, + "transfer": { + "from": "From", + "to": "To", + "amount_information": "Drag the slider to adjust the amount", + "amount": "Amount", + "memo": "Memo", + "information": "Are you sure to transfer funds?", + "amount_desc": "Balance", + "memo_desc": "This memo is public", + "convert_desc": "Convert takes 3.5 days and NOT recommended IF HBD price is higher than $1", + "to_placeholder": "Username", + "memo_placeholder": "Enter your notes here", + "transfer_token": "Transfer", + "purchase_estm": "Purchase Points", + "convert": "Convert HBD to HIVE", + "points": "Gift Points to someone", + "transfer_to_saving": "Transfer To Saving", + "powerUp": "Power Up", + "withdraw_to_saving": "Withdraw To Saving", + "steemconnect_title": "Hivesigner Transfer", + "estimated_weekly": "Estimated Weekly", + "destination_accounts": "Destination Accounts", + "stop_information": "Are you sure want to stop?", + "percent": "Percent", + "auto_vests": "Auto Vests", + "save": "SAVE", + "percent_information": "Percent info", + "next": "NEXT", + "delegate": "Delegate", + "power_down": "Power Down", + "withdraw_steem": "Withdraw HIVE", + "withdraw_sbd": "Withdraw HIVE Dollar", + "incoming_funds": "Incoming Funds", + "stop": "Stop", + "address_view": "View address" + }, + "boost": { + "title": "Get Points", + "buy": "GET Points", + "next": "NEXT", + "account": { + "title": "Get Account Boost", + "desc": "30 days delegation will boost your votes and social activities and give you more actions with more Resource Credits." + } + }, + "free_estm": { + "title": "Free Points", + "button": "SPIN & WIN", + "get_spin": "5 SPINS", + "spin_right": "Spin Left", + "timer_text": "Next free spin in" + }, + "promote": { + "title": "Promote", + "days": "days", + "user": "User", + "permlink": "Post", + "permlinkPlaceholder": "username/permlink", + "information": "Are you sure to promote?" + }, + "boostPost": { + "title": "Boost" + }, + "voters_dropdown": { + "rewards": "REWARDS", + "percent": "PERCENT", + "time": "TIME" + }, + "reblog": { + "title": "Reblog Info" + }, + "dsteem": { + "date_error": { + "device_time": "Your device time;", + "current_time": "Current time;", + "information": "We noticed that your device has incorrect date or time. Please fix Date & Time or Set Automatically and try again." + } + }, + "comments": { + "title": "Comments", + "reveal_comment": "Reveal comment", + "read_more": "Read more comments", + "more_replies": "more replies" + }, + "search_result": { + "others": "Others", + "communities": { + "title": "Communities", + "subscribe": "Join", + "unsubscribe": "Leave", + "subscribers": "Members", + "posters": "Posters", + "posts": "Posts" + }, + "communities_filter": { + "my": "My Communities", + "rank": "Rank", + "subs": "Members", + "new": "New" + }, + "post_result_filter": { + "popularity": "Popularity", + "newest": "Newest", + "relevance": "Relevance" + }, + "other_result_filter": { + "user": "User", + "tag": "Tag" + } + }, + "community": { + "new_post": "New Post", + "community": "community", + "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" + } +} From 8c5c923d987fdfb50378ded57c55d6aa74aaba85 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 4 Jan 2021 10:26:44 +0200 Subject: [PATCH 245/505] New translations en-US.json (Spanish, Mexico) --- src/config/locales/es-MX.json | 573 ++++++++++++++++++++++++++++++++++ 1 file changed, 573 insertions(+) create mode 100644 src/config/locales/es-MX.json diff --git a/src/config/locales/es-MX.json b/src/config/locales/es-MX.json new file mode 100644 index 0000000000..2fa5ae0caa --- /dev/null +++ b/src/config/locales/es-MX.json @@ -0,0 +1,573 @@ +{ + "wallet": { + "curation_reward": "Curation Reward", + "author_reward": "Author Reward", + "comment_benefactor_reward": "Benefactor Reward", + "claim_reward_balance": "Claim Reward ", + "transfer": "Transfer", + "transfer_to_vesting": "To Vesting", + "transfer_from_savings": "From Savings", + "withdraw_vesting": "Power Down", + "fill_order": "Fill Order", + "post": "Post", + "comment": "Comment", + "checkin": "Check-in", + "vote": "Vote", + "reblog": "Reblog", + "login": "Login", + "incoming_transfer_title": "Incoming transfer", + "outgoing_transfer_title": "Outgoing transfer", + "checkin_extra": "Bonus", + "delegation": "Delegation", + "delegations": "Delegations", + "delegation_title": "Delegation reward", + "delegation_desc": "Earn Points everyday for delegation", + "post_title": "Points for post", + "comment_title": "Points for comment", + "vote_title": "Points for vote", + "reblog_title": "Points for reblog", + "login_title": "Points for login", + "checkin_title": "Points for heartbeat", + "referral": "Referral", + "referral_title": "Referral rewards", + "referral_desc": "Invite friends and earn Points", + "checkin_extra_title": "Usage bonus", + "no_activity": "No recent activity", + "outgoing_transfer_description": "", + "incoming_transfer_description": "", + "post_desc": "You can earn point by posting regularly. Posting gives you upto 15 points.", + "comment_desc": "Each comment you make helps you to grow your audience and also earns you upto 5 points.", + "checkin_desc": "Checking in regularly gives you 0.25 points.", + "vote_desc": "By voting you give reward to other creators and also earn back upto 0.01 x vote weight points.", + "reblog_desc": "Share what post you like with your friends and earn points.", + "login_desc": "When you login into app first time you earn 100 points.", + "checkin_extra_desc": "Consistent use of app gives you extra chances to earn more points, be more active and earn more.", + "dropdown_transfer": "Gift", + "dropdown_promote": "Promote", + "dropdown_boost": "Boost", + "from": "From", + "to": "To", + "estimated_value_desc": "According to purchase value", + "estimated_value": "Estimated value", + "estimated_amount": "Vote value", + "amount_information": "Drag the slider to adjust the amount", + "amount": "Amount", + "memo": "Memo", + "information": "Are you sure to transfer funds?", + "amount_desc": "Balance", + "memo_desc": "This memo is public", + "to_placeholder": "Username", + "memo_placeholder": "Enter your notes here", + "transfer_token": "Transfer", + "purchase_estm": "GET POINTS", + "points": "Gift Points to someone", + "transfer_to_saving": "To Saving", + "powerUp": "Power Up", + "withdraw_to_saving": "Withdraw Saving", + "steemconnect_title": "Hivesigner Transfer", + "next": "NEXT", + "delegate": "Delegate", + "power_down": "Power Down", + "withdraw_steem": "Withdraw HIVE", + "withdraw_sbd": "Withdraw HBD", + "transfer_to_savings": "To Savings", + "convert": "Convert", + "escrow_transfer": "Escrow Transfer", + "escrow_dispute": "Escrow Dispute", + "escrow_release": "Escrow Release", + "escrow_approve": "Escrow Approve", + "cancel_transfer_from_savings": "Cancel From Savings", + "delegate_vesting_shares": "Delegation", + "fill_convert_request": "Convert Executed", + "fill_transfer_from_savings": "Savings Executed", + "fill_vesting_withdraw": "PowerDown executed", + "estm": { + "title": "Points", + "buy": "GET POINTS" + }, + "savingsteem": { + "title": "HIVE Savings" + }, + "savingsbd": { + "title": "HBD Savings" + }, + "steem": { + "title": "HIVE", + "buy": "GET HIVE" + }, + "sbd": { + "title": "HBD", + "buy": "GET HBD" + }, + "steem_power": { + "title": "HIVE POWER" + }, + "btc": { + "title": "BTC", + "buy": "GET BTC", + "address": "RECEIVE" + } + }, + "notification": { + "vote": "voted", + "unvote": "unvoted", + "reply": "replied to", + "mention": "mentioned in", + "follow": "followed you", + "unfollow": "unfollowed you", + "ignore": "ignored you", + "reblog": "reblogged", + "transfer": "transferred", + "spin": "Time to earn more Points", + "inactive": "Be active! Write a post, continue earning", + "referral": "joined with your referral, welcome them", + "notification": "Notifications", + "leaderboard": "Leaderboard", + "epoint": "Points", + "leaderboard_title": "Top Users", + "recent": "Recent", + "yesterday": "Yesterday", + "this_week": "This Week", + "this_month": "This Month", + "older_then": "Older Than A Month", + "activities": "All", + "replies": "Replies", + "mentions": "Mentions", + "reblogs": "Reblogs", + "noactivity": "No recent activity" + }, + "leaderboard": { + "daily": "DAILY", + "weekly": "WEEKLY", + "monthly": "MONTHLY" + }, + "messages": { + "comingsoon": "Messages feature is coming soon!" + }, + "profile": { + "following": "Following", + "follower": "Follower", + "post": "Posts", + "details": "Profile Details", + "comments": "Comments", + "replies": "Replies", + "wallet": "Wallet", + "wallet_details": "Wallet Details", + "unclaimed_rewards": "Unclaimed Rewards", + "full_in": "Full in", + "hours": "hours", + "voting_power": "Voting power", + "login_to_see": "Login to see", + "follow_people": "Follow some people to fill your feed", + "follow_communities": "Join some communities to fill your feed", + "havent_commented": "haven't commented anything yet", + "havent_posted": "haven't posted anything yet", + "steem_power": "Hive Power", + "next_power_text": "Next power down is in", + "days": "days", + "day": "day", + "steem_dollars": "Hive Dollars", + "savings": "Savings", + "edit": { + "display_name": "Display Name", + "about": "About", + "location": "Location", + "website": "Website" + } + }, + "settings": { + "settings": "Settings", + "general": "General", + "currency": "Currency", + "language": "Language", + "server": "Server", + "dark_theme": "Dark Theme", + "push_notification": "Push Notification", + "notification": { + "follow": "Follow", + "vote": "Vote", + "comment": "Comment", + "mention": "Mention", + "reblog": "Reblog", + "transfers": "Transfers" + }, + "pincode": "PIN code", + "reset_pin": "Reset Pin Code", + "reset": "Reset", + "nsfw_content": "NSFW", + "send_feedback": "Send Feedback", + "send": "Send", + "default_footer": "Default Footer", + "nsfw": { + "always_show": "Always show", + "always_hide": "Always hide", + "always_warn": "Always warn" + }, + "feedback_success": "Email successfully open", + "feedback_fail": "Email client could not open", + "server_fail": "Server not available" + }, + "voters": { + "voters_info": "Voters Info", + "no_user": "User is not found." + }, + "login": { + "signin": "Sign in", + "signup": "JOIN NOW", + "signin_title": "To get all the benefits of using Ecency", + "username": "Username", + "password": "Password or WIF", + "description": "By signing in, you agree to our Terms of Services and Privacy Policies.", + "cancel": "cancel", + "login": "LOGIN", + "steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Hivesigner.", + "steemconnect_fee_description": "info" + }, + "register": { + "button": "Sign Up", + "title": "Sign up", + "username": "Pick a username", + "mail": "Enter your email address", + "ref_user": "Referred user (Optional)", + "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", + "title_description": "One account to manage everything", + "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." + }, + "home": { + "feed": "Feed", + "popular": "Popular", + "top": "Top", + "hot": "Hot", + "new": "New", + "blog": "Blog", + "posts": "Posts", + "friends": "Friends", + "communities": "Communities" + }, + "side_menu": { + "profile": "Profile", + "bookmarks": "Bookmarks", + "favorites": "Favorites", + "drafts": "Drafts", + "schedules": "Schedules", + "gallery": "Gallery", + "settings": "Settings", + "add_account": "Add Account", + "logout": "Logout", + "cancel": "Cancel", + "logout_text": "Are you sure you want to logout?", + "create_a_new_account": "Create a new account", + "add_an_existing_account": "Add an existing account", + "accounts": "Accounts" + }, + "header": { + "title": "Login to customize your feed", + "search": "Search..." + }, + "basic_header": { + "publish": "Publish", + "search": "Search", + "update": "Update", + "reply": "Reply" + }, + "editor": { + "title": "Title", + "tags": "Tags (separate with space)", + "default_placeholder": "Tell us something...", + "reply_placeholder": "Add your reply...", + "publish": "Publish", + "reply": "Reply", + "open_gallery": "Open Gallery", + "capture_photo": "Capture a photo", + "limited_tags": "Only 10 tags allowed, remove some", + "limited_length": "Maximum length of each tag should be 24", + "limited_dash": "Use one dash in each tag", + "limited_space": "Use space to separate tags", + "limited_lowercase": "Only use lower letters in tag", + "limited_characters": "Use only lowercase letters, digits and one dash", + "limited_firstchar": "Tag must start with a letter", + "limited_lastchar": "Tag must end with letter or number", + "setting_schedule": "Scheduling Time", + "setting_reward": "Reward", + "setting_beneficiary": "Beneficiary", + "reward_default": "Default 50% / 50%", + "reward_power_up": "Power Up 100%", + "reward_decline": "Decline Payout", + "beneficiaries": "Beneficiaries", + "options": "Options", + "my_blog": "My Blog", + "my_communities": "My Communities", + "top_communities": "Top Communities" + }, + "pincode": { + "enter_text": "Enter PIN to unlock", + "set_new": "Set new PIN", + "write_again": "Write again", + "forgot_text": "Oh, I forgot it..." + }, + "alert": { + "success": "Success!", + "successful": "Successful", + "allRead": "Marked all notifications as read", + "claim_reward_balance_ok": "Reward balance claimed", + "fail": "Fail!", + "move": "Move", + "move_question": "Are you sure to move to drafts?", + "success_shared": "Success! Content submitted!", + "success_moved": "Moved to draft", + "permission_denied": "Permission denied", + "permission_text": "Please, go to phone Settings and change Ecency app permissions.", + "key_warning": "Operation requires active key or master password, please relogin!", + "success_rebloged": "Reblogged!", + "already_rebloged": "You have already reblogged!", + "success_favorite": "Favorite added!", + "success_unfavorite": "Favorite removed!", + "success_follow": "Follow success!", + "fail_follow": "Follow failed!", + "success_subscribe": "Subscribe success!", + "fail_subscribe": "Subscribe failed!", + "success_leave": "Leave success!", + "fail_leave": "Leave failed!", + "success_mute": "Mute success!", + "success_unmute": "Unmute success!", + "success_unfollow": "Unfollow success!", + "fail_unfollow": "Unfollow failed!", + "warning": "Warning", + "invalid_pincode": "Invalid PIN code, please check and try again.", + "remove_alert": "Are you sure you want to remove?", + "clear_alert": "Are you sure you want to clear?", + "clear_user_alert": "Are you sure you want to clear all user data?", + "clear": "Clear", + "cancel": "Cancel", + "delete": "Delete", + "copied": "Copied!", + "no_internet": "No connection!", + "confirm": "Confirm", + "removed": "Removed", + "same_user": "This user already added to list", + "unknow_error": "An error occurred", + "error": "Error", + "fetch_error": "Connection issue, change server and restart", + "connection_fail": "Connection Failed!", + "connection_success": "Successfully connected!", + "checking": "Checking...", + "external_link": "Open in Browser", + "not_existing_post": "The post does not exist! Please check permlink and author.", + "google_play_version": "We noticed that your device has old version of Google Play. Please update Google Play services and try again!", + "rc_down": "Not enough resource credits to perform an action! \n\nBoost your account to continue enjoy the experience. Do you want to boost your account, now?", + "payloadTooLarge": "File size too big, please resize or upload smaller image", + "qoutaExceeded": "Upload quota exceeded", + "invalidImage": "Invalid image, try different file", + "something_wrong": "Something went wrong.", + "something_wrong_alt": "Try https://ecency.com", + "something_wrong_reload": "Reload" + }, + "post": { + "reblog_alert": "Are you sure, you want to reblog?", + "removed_hint": "Content is not available", + "copy_link": "Copy link", + "reblogged": "reblogged by", + "sponsored": "SPONSORED", + "open_thread": "Open thread", + "image": "Image", + "link": "Link", + "gallery_mode": "Gallery mode", + "save_to_local": "Download to device", + "image_saved": "Image saved to Photo Gallery", + "image_saved_error": "Error Saving Image", + "wrong_link": "Wrong link" + }, + "drafts": { + "title": "Drafts", + "load_error": "Could not load drafts", + "empty_list": "Nothing here", + "deleted": "Draft deleted" + }, + "schedules": { + "title": "Schedules", + "empty_list": "Nothing here", + "deleted": "Scheduled post deleted", + "move": "Move to drafts", + "moved": "Moved to drafts" + }, + "bookmarks": { + "title": "Bookmarks", + "load_error": "Could not load bookmarks", + "empty_list": "Nothing here", + "deleted": "Bookmark removed", + "search": "Search in bookmarks", + "added": "Added to bookmarks", + "add": "Add to bookmarks" + }, + "report": { + "added": "Reported objectionable content" + }, + "favorites": { + "title": "Favorites", + "load_error": "Could not load favorites", + "empty_list": "Nothing here", + "search": "Search in favorites" + }, + "auth": { + "invalid_pin": "Invalid PIN code, please check and try again", + "invalid_username": "Invalid username, please check and try again", + "already_logged": "You are already logged in, please try to add another account", + "invalid_credentials": "Invalid credentials, please check and try again", + "unknow_error": "Unknown error, please write to support@ecency.com" + }, + "payout": { + "potential_payout": "Potential Payout", + "promoted": "Promoted", + "author_payout": "Author Payout", + "curation_payout": "Curation Payout", + "payout_date": "Payout", + "beneficiaries": "Beneficiaries", + "warn_zero_payout": "Amount must reach $0.02 for payout", + "breakdown": "Breakdown" + }, + "post_dropdown": { + "copy": "copy link", + "reblog": "reblog", + "reply": "reply", + "share": "share", + "bookmarks": "add to bookmarks", + "promote": "promote", + "boost": "boost", + "report": "report" + }, + "deep_link": { + "no_existing_user": "No existing user", + "no_existing_post": "No existing post" + }, + "search": { + "posts": "Posts", + "comments": "Comments" + }, + "comment_filter": { + "trending": "TOP", + "reputation": "REPUTATION", + "votes": "VOTE", + "age": "AGE", + "top": "TOP", + "time": "TIME" + }, + "transfer": { + "from": "From", + "to": "To", + "amount_information": "Drag the slider to adjust the amount", + "amount": "Amount", + "memo": "Memo", + "information": "Are you sure to transfer funds?", + "amount_desc": "Balance", + "memo_desc": "This memo is public", + "convert_desc": "Convert takes 3.5 days and NOT recommended IF HBD price is higher than $1", + "to_placeholder": "Username", + "memo_placeholder": "Enter your notes here", + "transfer_token": "Transfer", + "purchase_estm": "Purchase Points", + "convert": "Convert HBD to HIVE", + "points": "Gift Points to someone", + "transfer_to_saving": "Transfer To Saving", + "powerUp": "Power Up", + "withdraw_to_saving": "Withdraw To Saving", + "steemconnect_title": "Hivesigner Transfer", + "estimated_weekly": "Estimated Weekly", + "destination_accounts": "Destination Accounts", + "stop_information": "Are you sure want to stop?", + "percent": "Percent", + "auto_vests": "Auto Vests", + "save": "SAVE", + "percent_information": "Percent info", + "next": "NEXT", + "delegate": "Delegate", + "power_down": "Power Down", + "withdraw_steem": "Withdraw HIVE", + "withdraw_sbd": "Withdraw HIVE Dollar", + "incoming_funds": "Incoming Funds", + "stop": "Stop", + "address_view": "View address" + }, + "boost": { + "title": "Get Points", + "buy": "GET Points", + "next": "NEXT", + "account": { + "title": "Get Account Boost", + "desc": "30 days delegation will boost your votes and social activities and give you more actions with more Resource Credits." + } + }, + "free_estm": { + "title": "Free Points", + "button": "SPIN & WIN", + "get_spin": "5 SPINS", + "spin_right": "Spin Left", + "timer_text": "Next free spin in" + }, + "promote": { + "title": "Promote", + "days": "days", + "user": "User", + "permlink": "Post", + "permlinkPlaceholder": "username/permlink", + "information": "Are you sure to promote?" + }, + "boostPost": { + "title": "Boost" + }, + "voters_dropdown": { + "rewards": "REWARDS", + "percent": "PERCENT", + "time": "TIME" + }, + "reblog": { + "title": "Reblog Info" + }, + "dsteem": { + "date_error": { + "device_time": "Your device time;", + "current_time": "Current time;", + "information": "We noticed that your device has incorrect date or time. Please fix Date & Time or Set Automatically and try again." + } + }, + "comments": { + "title": "Comments", + "reveal_comment": "Reveal comment", + "read_more": "Read more comments", + "more_replies": "more replies" + }, + "search_result": { + "others": "Others", + "communities": { + "title": "Communities", + "subscribe": "Join", + "unsubscribe": "Leave", + "subscribers": "Members", + "posters": "Posters", + "posts": "Posts" + }, + "communities_filter": { + "my": "My Communities", + "rank": "Rank", + "subs": "Members", + "new": "New" + }, + "post_result_filter": { + "popularity": "Popularity", + "newest": "Newest", + "relevance": "Relevance" + }, + "other_result_filter": { + "user": "User", + "tag": "Tag" + } + }, + "community": { + "new_post": "New Post", + "community": "community", + "details": "Details" + }, + "user": { + "follow": "Follow", + "unfollow": "Unfollow" + } +} From 31730f9580c34ad83d85cc21ab168a94b35271f6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 4 Jan 2021 16:40:52 +0200 Subject: [PATCH 246/505] New translations en-US.json (German) --- src/config/locales/de-DE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 9804167f1c..64e694bebf 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -3,7 +3,7 @@ "curation_reward": "Kuratoren-Belohnung", "author_reward": "Autoren-Belohnung", "comment_benefactor_reward": "Benefactor Reward", - "claim_reward_balance": "Claim Reward ", + "claim_reward_balance": "Belohnung abholen ", "transfer": "Überweisen", "transfer_to_vesting": "To Vesting", "transfer_from_savings": "From Savings", @@ -28,7 +28,7 @@ "reblog_title": "Punkte für einen ReBlog", "login_title": "Punkte für den Login", "checkin_title": "Punkte für den Herzschlag", - "referral": "Referral", + "referral": "Empfehlung", "referral_title": "Referral rewards", "referral_desc": "Freunde einladen und Punkte verdienen", "checkin_extra_title": "Nutzungs-Bonus", From 6a70deb8d20c3587693cd6ca820e89b81fabe8f6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 4 Jan 2021 16:48:54 +0200 Subject: [PATCH 247/505] New translations en-US.json (German) --- src/config/locales/de-DE.json | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 64e694bebf..1a165da7c4 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -29,15 +29,15 @@ "login_title": "Punkte für den Login", "checkin_title": "Punkte für den Herzschlag", "referral": "Empfehlung", - "referral_title": "Referral rewards", + "referral_title": "Empfehlungsprämien", "referral_desc": "Freunde einladen und Punkte verdienen", "checkin_extra_title": "Nutzungs-Bonus", "no_activity": "Keine kürzliche Aktivität", "outgoing_transfer_description": "", "incoming_transfer_description": "", - "post_desc": "You can earn point by posting regularly. Posting gives you upto 15 points.", - "comment_desc": "Each comment you make helps you to grow your audience and also earns you upto 5 points.", - "checkin_desc": "Checking in regularly gives you 0.25 points.", + "post_desc": "Du bekommst Punkte durch regelmäßiges Posten. Ein Beitrag bringt Dir bis zu 15 Punkte.", + "comment_desc": "Jedes Kommentar hilft Dir Deine Leserschaft zu erweitern. Außerdem bekommst Du bis zu 5 Punkte je Kommentar.", + "checkin_desc": "Für regelmäßiges Einchecken erhälst Du 0.25 Punkte.", "vote_desc": "By voting you give reward to other creators and also earn back upto 0.01 x vote weight points.", "reblog_desc": "Share what post you like with your friends and earn points.", "login_desc": "When you login into app first time you earn 100 points.", @@ -48,7 +48,7 @@ "from": "Von", "to": "zu", "estimated_value_desc": "According to purchase value", - "estimated_value": "Estimated value", + "estimated_value": "Schätzwert", "estimated_amount": "Vote Wert", "amount_information": "Ziehe den Slider, um den Wert zu definieren", "amount": "Betrag", @@ -60,7 +60,7 @@ "memo_placeholder": "Hier dein Memo eingeben", "transfer_token": "Überweisen", "purchase_estm": "GET POINTS", - "points": "Gift Points to someone", + "points": "Schenke jemanden Punkte", "transfer_to_saving": "To Saving", "powerUp": "Power Up", "withdraw_to_saving": "Withdraw Saving", @@ -78,7 +78,7 @@ "escrow_approve": "Escrow Approve", "cancel_transfer_from_savings": "Cancel From Savings", "delegate_vesting_shares": "Delegation", - "fill_convert_request": "Convert Executed", + "fill_convert_request": "Konvertieren ausgeführt", "fill_transfer_from_savings": "Savings Executed", "fill_vesting_withdraw": "PowerDown executed", "estm": { @@ -111,14 +111,14 @@ "notification": { "vote": "voted", "unvote": "unvoted", - "reply": "replied to", + "reply": "hat geantwortet auf", "mention": "mentioned in", "follow": "folgt dir jetzt", "unfollow": "folgt dir nicht mehr", "ignore": "ignoriert dich", - "reblog": "reblogged", - "transfer": "transferred", - "spin": "Time to earn more Points", + "reblog": "geteilt", + "transfer": "überwiesen", + "spin": "Zeit mehr Punkte zu verdienen", "inactive": "Be active! Write a post, continue earning", "referral": "joined with your referral, welcome them", "notification": "Benachrichtigungen", @@ -217,20 +217,20 @@ "signin_title": "To get all the benefits of using Ecency", "username": "Benutzername", "password": "Passwort oder WIF", - "description": "By signing in, you agree to our Terms of Services and Privacy Policies.", + "description": "Wenn du dich anmeldest, stimmst du unseren Nutzungsbedingungen & und Datenschutzrichtlinien zu.", "cancel": "Abbrechen", "login": "LOGIN", - "steemconnect_description": "If you don't want to keep your password encrypted and saved on your device, you can use Hivesigner.", + "steemconnect_description": "Wenn du dein Passwort nicht verschlüsselt auf deinem Gerät gespeichert haben möchtest, kannst du Hivesigner verwenden.", "steemconnect_fee_description": "info" }, "register": { - "button": "Sign Up", + "button": "Registrieren", "title": "Registrieren", - "username": "Pick a username", - "mail": "Enter your email address", - "ref_user": "Referred user (Optional)", + "username": "Wähle einen Benutzernamen", + "mail": "E-Mail Adresse eingeben", + "ref_user": "Empfohlener Benutzer (optional)", "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", - "title_description": "One account to manage everything", + "title_description": "Ein Konto um alles zu verwalten", "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." }, "home": { @@ -238,10 +238,10 @@ "popular": "Populär", "top": "Top", "hot": "Hot", - "new": "New", + "new": "Neu", "blog": "Blog", "posts": "Beiträge", - "friends": "Friends", + "friends": "Freunde", "communities": "Communities" }, "side_menu": { @@ -256,9 +256,9 @@ "logout": "Abmelden", "cancel": "Abbrechen", "logout_text": "Bist du sicher, dass du dich ausloggen möchtest?", - "create_a_new_account": "Create a new account", - "add_an_existing_account": "Add an existing account", - "accounts": "Accounts" + "create_a_new_account": "Neues Konto erstellen", + "add_an_existing_account": "Bestehendes Konto hinzufügen", + "accounts": "Konten" }, "header": { "title": "Login, um den Feed anzupassen", @@ -272,14 +272,14 @@ }, "editor": { "title": "Titel", - "tags": "Tags (separate with space)", - "default_placeholder": "Tell us something...", - "reply_placeholder": "Add your reply...", + "tags": "Tags (durch Leerzeichen getrennt)", + "default_placeholder": "Erzähle uns etwas...", + "reply_placeholder": "Antwort hinzufügen...", "publish": "Veröffentlichen", "reply": "Antworten", "open_gallery": "Galerie öffnen", "capture_photo": "Ein Foto aufnehmen", - "limited_tags": "Only 10 tags allowed, remove some", + "limited_tags": "Es sind nur 10 Tags erlaubt. Bitte entferne ein paar", "limited_length": "Maximum length of each tag should be 24", "limited_dash": "Use one dash in each tag", "limited_space": "Use space to separate tags", From b06082635439c092f59772f8ca5e906f0e47c15b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 4 Jan 2021 17:08:26 +0200 Subject: [PATCH 248/505] New translations en-US.json (German) --- src/config/locales/de-DE.json | 194 +++++++++++++++++----------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 1a165da7c4..277e6b4802 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -6,7 +6,7 @@ "claim_reward_balance": "Belohnung abholen ", "transfer": "Überweisen", "transfer_to_vesting": "To Vesting", - "transfer_from_savings": "From Savings", + "transfer_from_savings": "aus den Ersparnissen", "withdraw_vesting": "Power-Down", "fill_order": "Order ausgeführt", "post": "Beitrag", @@ -21,7 +21,7 @@ "delegation": "Delegation", "delegations": "Delegationen", "delegation_title": "Delegations-Belohnung", - "delegation_desc": "Earn Points everyday for delegation", + "delegation_desc": "Erhalte jeden Tag Punkte für die Delegation", "post_title": "Punkte für einen Beitrag", "comment_title": "Punkte für einen Kommentar", "vote_title": "Punkte für einen Vote", @@ -39,9 +39,9 @@ "comment_desc": "Jedes Kommentar hilft Dir Deine Leserschaft zu erweitern. Außerdem bekommst Du bis zu 5 Punkte je Kommentar.", "checkin_desc": "Für regelmäßiges Einchecken erhälst Du 0.25 Punkte.", "vote_desc": "By voting you give reward to other creators and also earn back upto 0.01 x vote weight points.", - "reblog_desc": "Share what post you like with your friends and earn points.", - "login_desc": "When you login into app first time you earn 100 points.", - "checkin_extra_desc": "Consistent use of app gives you extra chances to earn more points, be more active and earn more.", + "reblog_desc": "Teile einen Beitrag, den du magst mit deinen Freunden und erhalte Punkt.", + "login_desc": "Wenn Du Dich das erste Mal in die App einloggst, bekommst Du 100 Punkte.", + "checkin_extra_desc": "Die regelmäßige Nutzung der App gibt dir mehr Chancen, weitere Punkte zu bekommen. Sei aktiv und verdiene mehr.", "dropdown_transfer": "Geschenk", "dropdown_promote": "Bewerben", "dropdown_boost": "Boost", @@ -59,18 +59,18 @@ "to_placeholder": "Benutzername", "memo_placeholder": "Hier dein Memo eingeben", "transfer_token": "Überweisen", - "purchase_estm": "GET POINTS", + "purchase_estm": "POINTS ERHALTEN", "points": "Schenke jemanden Punkte", - "transfer_to_saving": "To Saving", + "transfer_to_saving": "zu den Ersparnissen", "powerUp": "Power Up", - "withdraw_to_saving": "Withdraw Saving", - "steemconnect_title": "Hivesigner Transfer", + "withdraw_to_saving": "Ersparnisse lösen", + "steemconnect_title": "Hivesigner-Transfer", "next": "WEITER", "delegate": "Delegieren", "power_down": "Power-Down", - "withdraw_steem": "Withdraw HIVE", - "withdraw_sbd": "Withdraw HBD", - "transfer_to_savings": "To Savings", + "withdraw_steem": "HIVE auszahlen", + "withdraw_sbd": "HBD auszahlen", + "transfer_to_savings": "zu den Ersparnissen", "convert": "Umwandeln", "escrow_transfer": "Escrow Transfer", "escrow_dispute": "Escrow Dispute", @@ -83,44 +83,44 @@ "fill_vesting_withdraw": "PowerDown executed", "estm": { "title": "eSteem Punkte", - "buy": "GET POINTS" + "buy": "PUNKTE ERHALTEN" }, "savingsteem": { - "title": "HIVE Savings" + "title": "HIVE Ersparnisse" }, "savingsbd": { - "title": "HBD Savings" + "title": "HBD Ersparnisse" }, "steem": { "title": "HIVE", - "buy": "GET HIVE" + "buy": "HIVE BEKOMMEN" }, "sbd": { "title": "HBD", - "buy": "GET HBD" + "buy": "HBD BEKOMMEN" }, "steem_power": { "title": "HIVE POWER" }, "btc": { "title": "BTC", - "buy": "GET BTC", - "address": "RECEIVE" + "buy": "BTC BEKOMMEN", + "address": "ERHALTEN" } }, "notification": { - "vote": "voted", - "unvote": "unvoted", + "vote": "abgestimmt", + "unvote": "nicht abgestimmt", "reply": "hat geantwortet auf", - "mention": "mentioned in", + "mention": "erwähnt in", "follow": "folgt dir jetzt", "unfollow": "folgt dir nicht mehr", "ignore": "ignoriert dich", "reblog": "geteilt", "transfer": "überwiesen", "spin": "Zeit mehr Punkte zu verdienen", - "inactive": "Be active! Write a post, continue earning", - "referral": "joined with your referral, welcome them", + "inactive": "Sei aktiv! Schreibe einen Beitrag, verdiene weiter", + "referral": "ist mit Deiner Empfehlung beigetreten. Sende eine Wilkommensnachricht", "notification": "Benachrichtigungen", "leaderboard": "Rangliste", "epoint": "eSteem Punkte", @@ -130,16 +130,16 @@ "this_week": "Diese Woche", "this_month": "Diesen Monat", "older_then": "Älter als ein Monat", - "activities": "All", + "activities": "Alle", "replies": "Antworten", - "mentions": "Mentions", + "mentions": "Erwähnungen", "reblogs": "Reblogs", - "noactivity": "No recent activity" + "noactivity": "Keine kürzlichen Aktivitäten" }, "leaderboard": { - "daily": "DAILY", - "weekly": "WEEKLY", - "monthly": "MONTHLY" + "daily": "TÄGLICH", + "weekly": "WÖCHENTLICH", + "monthly": "MONATLICH" }, "messages": { "comingsoon": "Nachrichten-Feature ist bald verfügbar!" @@ -158,15 +158,15 @@ "hours": "Stunden", "voting_power": "Voting-Power", "login_to_see": "Login", - "follow_people": "Follow some people to fill your feed", - "follow_communities": "Join some communities to fill your feed", + "follow_people": "Folge ein paar Leuten, um Deinen Feed mit Leben zu füllen", + "follow_communities": "Trete ein paar Communities bei, um Deinen Feed mit Leben zu füllen", "havent_commented": "hat bisher nichts kommentiert", "havent_posted": "hat bisher noch keine Beiträge veröffentlicht", - "steem_power": "Hive Power", + "steem_power": "HIVE Power", "next_power_text": "Nächster Power Down ist in", "days": "Tagen", "day": "Tag", - "steem_dollars": "Hive Dollars", + "steem_dollars": "HIVE Dollars", "savings": "Gesichert", "edit": { "display_name": "Anzeige Name", @@ -280,23 +280,23 @@ "open_gallery": "Galerie öffnen", "capture_photo": "Ein Foto aufnehmen", "limited_tags": "Es sind nur 10 Tags erlaubt. Bitte entferne ein paar", - "limited_length": "Maximum length of each tag should be 24", + "limited_length": "Tags dürfne nur 24 Zeichen lang sein", "limited_dash": "Use one dash in each tag", "limited_space": "Use space to separate tags", "limited_lowercase": "Only use lower letters in tag", "limited_characters": "Use only lowercase letters, digits and one dash", - "limited_firstchar": "Tag must start with a letter", - "limited_lastchar": "Tag must end with letter or number", + "limited_firstchar": "Tags müssen mit einem Buchstaben beginnen", + "limited_lastchar": "Tags müssen mit einem Buchstaben oder einer Zahl enden", "setting_schedule": "Scheduling Time", - "setting_reward": "Reward", + "setting_reward": "Belohnung", "setting_beneficiary": "Beneficiary", - "reward_default": "Default 50% / 50%", - "reward_power_up": "Power Up 100%", - "reward_decline": "Decline Payout", + "reward_default": "Standard 50% / 50%", + "reward_power_up": "100% Power-Up", + "reward_decline": "Auf die Auszahlung verzichten", "beneficiaries": "Beneficiaries", - "options": "Options", - "my_blog": "My Blog", - "my_communities": "My Communities", + "options": "Optionen", + "my_blog": "Mein Blog", + "my_communities": "Meine Communitys", "top_communities": "Top Communities" }, "pincode": { @@ -313,16 +313,16 @@ "fail": "Fehlgeschlagen!", "move": "Verschieben", "move_question": "Bist du sicher, dass du zu Entwürfen wechseln möchtest?", - "success_shared": "Success! Content submitted!", + "success_shared": "Erfolgreich! Beitrag erstellt!", "success_moved": "Erfolgreich in Entwürfe verschoben", "permission_denied": "Berechtigung verweigert", - "permission_text": "Please, go to phone Settings and change Ecency app permissions.", - "key_warning": "Operation requires active key or master password, please relogin!", + "permission_text": "Bitte gehe zu den Telefoneinstellungen und ändere die Berechtigungen der Ecency App.", + "key_warning": "Operation erfordert den Active Key oder das Master-Passwort, bitte neu anmelden!", "success_rebloged": "Geteilt!", "already_rebloged": "Du hast bereits geteilt!", - "success_favorite": "Favorite added!", - "success_unfavorite": "Favorite removed!", - "success_follow": "Follow success!", + "success_favorite": "Favorit hinzugefügt!", + "success_unfavorite": "Favorit entfernt!", + "success_follow": "Erfolgreich gefolgt!", "fail_follow": "Follow failed!", "success_subscribe": "Subscribe success!", "fail_subscribe": "Subscribe failed!", @@ -400,7 +400,7 @@ "add": "Neues Lesezeichen" }, "report": { - "added": "Reported objectionable content" + "added": "Gemeldeter anstößiger Inhalt" }, "favorites": { "title": "Favoriten", @@ -413,7 +413,7 @@ "invalid_username": "Ungültiger Username, bitte überprüfen und erneut versuchen", "already_logged": "Du bist bereits eingeloggt. Bitte versuche ein anderes Konto hinzuzufügen", "invalid_credentials": "Ungültige Zugangsdaten, bitte überprüfen und erneut versuchen", - "unknow_error": "Unknown error, please write to support@ecency.com" + "unknow_error": "Unbekannter Fehler! Bitte kontaktiere uns unter support@ecency.com" }, "payout": { "potential_payout": "Potenzielle Auszahlung", @@ -422,7 +422,7 @@ "curation_payout": "Kuratoren-Auszahlung", "payout_date": "Auszahlung", "beneficiaries": "Beneficiaries", - "warn_zero_payout": "Amount must reach $0.02 for payout", + "warn_zero_payout": "Betrag muss $0.02 für die Auszahlung erreichen", "breakdown": "Breakdown" }, "post_dropdown": { @@ -447,7 +447,7 @@ "trending": "TOP", "reputation": "REPUTATION", "votes": "VOTE", - "age": "AGE", + "age": "ALTER", "top": "TOP", "time": "ZEIT" }, @@ -464,51 +464,51 @@ "to_placeholder": "Benutzername", "memo_placeholder": "Hier dein Memo eingeben", "transfer_token": "Überweisen", - "purchase_estm": "Purchase Points", - "convert": "Convert HBD to HIVE", - "points": "Gift Points to someone", + "purchase_estm": "Punkte kaufen", + "convert": "HBD in HIVE umwandeln", + "points": "Schenke jemandem Punkte", "transfer_to_saving": "Zum Sparkonto überweisen", "powerUp": "Power Up", "withdraw_to_saving": "Auszahlung in den Tresor", - "steemconnect_title": "Hivesigner Transfer", - "estimated_weekly": "Estimated Weekly", - "destination_accounts": "Destination Accounts", - "stop_information": "Are you sure want to stop?", - "percent": "Percent", + "steemconnect_title": "Hivesigner-Transfer", + "estimated_weekly": "Geschätzt wöchentlich", + "destination_accounts": "Zielkonten", + "stop_information": "Möchtest du wirklich abbrechen?", + "percent": "Prozent", "auto_vests": "Auto Vests", - "save": "SAVE", - "percent_information": "Percent info", + "save": "SPEICHERN", + "percent_information": "Prozent Info", "next": "WEITER", "delegate": "Delegieren", "power_down": "Power-Down", - "withdraw_steem": "Withdraw HIVE", - "withdraw_sbd": "Withdraw HIVE Dollar", - "incoming_funds": "Incoming Funds", + "withdraw_steem": "HIVE auszahlen", + "withdraw_sbd": "HIVE Dollar auszahlen", + "incoming_funds": "Eingehend", "stop": "Stop", - "address_view": "View address" + "address_view": "Adresse anzeigen" }, "boost": { - "title": "Get Points", - "buy": "GET Points", + "title": "Punkte erhalten", + "buy": "Punkte erhalten", "next": "WEITER", "account": { - "title": "Get Account Boost", + "title": "Konto-Boost erhalten", "desc": "30 days delegation will boost your votes and social activities and give you more actions with more Resource Credits." } }, "free_estm": { - "title": "Free Points", + "title": "Kostenlose Punkte", "button": "SPIN & WIN", "get_spin": "5 SPINS", - "spin_right": "Spin Left", - "timer_text": "Next free spin in" + "spin_right": "Links drehen", + "timer_text": "Nächster freier Spin in" }, "promote": { "title": "Bewerben", "days": "Tage", "user": "Benutzer", "permlink": "Beitrag", - "permlinkPlaceholder": "username/permlink", + "permlinkPlaceholder": "benutzername/permlink", "information": "Bist du sicher, das du promoten möchtest?" }, "boostPost": { @@ -524,37 +524,37 @@ }, "dsteem": { "date_error": { - "device_time": "Your device time;", - "current_time": "Current time;", - "information": "We noticed that your device has incorrect date or time. Please fix Date & Time or Set Automatically and try again." + "device_time": "Lokale Gerätezeit;", + "current_time": "Aktuelle Zeit;", + "information": "Wir haben festgestellt, dass Dein Gerät ein falsches Datum oder eine falsche Zeit hat. Bitte korrigiere Datum & Zeit oder setze sie auf \"automatisch ermitteln\" und versuche es erneut." } }, "comments": { "title": "Kommentare", - "reveal_comment": "Reveal comment", - "read_more": "Read more comments", - "more_replies": "more replies" + "reveal_comment": "Kommentar anzeigen", + "read_more": "Weitere Kommentare", + "more_replies": "weitere Antworten" }, "search_result": { - "others": "Others", + "others": "Andere", "communities": { "title": "Communities", - "subscribe": "Join", - "unsubscribe": "Leave", - "subscribers": "Members", - "posters": "Posters", + "subscribe": "Beitreten", + "unsubscribe": "Austreten", + "subscribers": "Mitglieder", + "posters": "Autoren", "posts": "Beiträge" }, "communities_filter": { - "my": "My Communities", - "rank": "Rank", - "subs": "Members", - "new": "New" + "my": "Meine Communitys", + "rank": "Rang", + "subs": "Mitglieder", + "new": "Neu" }, "post_result_filter": { - "popularity": "Popularity", - "newest": "Newest", - "relevance": "Relevance" + "popularity": "Beliebtheit", + "newest": "Neueste", + "relevance": "Relevanz" }, "other_result_filter": { "user": "Benutzer", @@ -562,12 +562,12 @@ } }, "community": { - "new_post": "New Post", - "community": "community", + "new_post": "Neuer Beitrag", + "community": "Community", "details": "Details" }, "user": { - "follow": "Follow", - "unfollow": "Unfollow" + "follow": "Folgen", + "unfollow": "Nicht mehr folgen" } } From 9ac202c94b8221e7bbea8f575863a22e704cd3d5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 4 Jan 2021 17:23:32 +0200 Subject: [PATCH 249/505] New translations en-US.json (German) --- src/config/locales/de-DE.json | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 277e6b4802..95336cee55 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -47,7 +47,7 @@ "dropdown_boost": "Boost", "from": "Von", "to": "zu", - "estimated_value_desc": "According to purchase value", + "estimated_value_desc": "Je nach Kaufwert", "estimated_value": "Schätzwert", "estimated_amount": "Vote Wert", "amount_information": "Ziehe den Slider, um den Wert zu definieren", @@ -79,7 +79,7 @@ "cancel_transfer_from_savings": "Cancel From Savings", "delegate_vesting_shares": "Delegation", "fill_convert_request": "Konvertieren ausgeführt", - "fill_transfer_from_savings": "Savings Executed", + "fill_transfer_from_savings": "Sparen ausgeführt", "fill_vesting_withdraw": "PowerDown executed", "estm": { "title": "eSteem Punkte", @@ -213,7 +213,7 @@ }, "login": { "signin": "Anmelden", - "signup": "JOIN NOW", + "signup": "JETZT ANMELDEN", "signin_title": "To get all the benefits of using Ecency", "username": "Benutzername", "password": "Passwort oder WIF", @@ -282,9 +282,9 @@ "limited_tags": "Es sind nur 10 Tags erlaubt. Bitte entferne ein paar", "limited_length": "Tags dürfne nur 24 Zeichen lang sein", "limited_dash": "Use one dash in each tag", - "limited_space": "Use space to separate tags", - "limited_lowercase": "Only use lower letters in tag", - "limited_characters": "Use only lowercase letters, digits and one dash", + "limited_space": "Benutze Leerzeichen, um Tags zu trennen", + "limited_lowercase": "Tags müssen klein geschrieben sein", + "limited_characters": "Verwende nur Kleinbuchstaben, Ziffern und max. einen Bindestrich", "limited_firstchar": "Tags müssen mit einem Buchstaben beginnen", "limited_lastchar": "Tags müssen mit einem Buchstaben oder einer Zahl enden", "setting_schedule": "Scheduling Time", @@ -323,15 +323,15 @@ "success_favorite": "Favorit hinzugefügt!", "success_unfavorite": "Favorit entfernt!", "success_follow": "Erfolgreich gefolgt!", - "fail_follow": "Follow failed!", - "success_subscribe": "Subscribe success!", - "fail_subscribe": "Subscribe failed!", - "success_leave": "Leave success!", - "fail_leave": "Leave failed!", - "success_mute": "Mute success!", - "success_unmute": "Unmute success!", - "success_unfollow": "Unfollow success!", - "fail_unfollow": "Unfollow failed!", + "fail_follow": "Folgen fehlgeschlagen!", + "success_subscribe": "Erfolgreich abonniert!", + "fail_subscribe": "Abonnieren fehlgeschlagen!", + "success_leave": "Verlassen erfolgreich!", + "fail_leave": "Verlassen fehlgeschlagen!", + "success_mute": "Stummschalten erfolgreich!", + "success_unmute": "Deaktivieren der Stummschaltung erfolgreich!", + "success_unfollow": "Erfolgreich entfolgt!", + "fail_unfollow": "Entfolgen fehlgeschlagen!", "warning": "Warnung", "invalid_pincode": "Ungültiger PIN-Code, bitte überprüfen und erneut versuchen.", "remove_alert": "Bist du sicher, dass du es entfernen möchtest?", @@ -347,17 +347,17 @@ "same_user": "Dieser User ist bereits in der Liste eingetragen.", "unknow_error": "Es ist ein Fehler aufgetreten", "error": "Fehler", - "fetch_error": "Connection issue, change server and restart", + "fetch_error": "Verbindungsproblem, Server ändern und neu starten", "connection_fail": "Verbindung fehlgeschlagen!", "connection_success": "Erfolgreich verbunden!", "checking": "Wird überprüft...", "external_link": "Im Browser öffnen", "not_existing_post": "Der Beitrag existiert nicht! Bitte überprüfe den Permalink und den Autor.", "google_play_version": "Wir haben festgestellt, dass dein Gerät eine alte Version von Google Play hat. Bitte aktualisiere die Google Play-Dienste und versuche es erneut!", - "rc_down": "Not enough resource credits to perform an action! \n\nBoost your account to continue enjoy the experience. Do you want to boost your account, now?", - "payloadTooLarge": "File size too big, please resize or upload smaller image", - "qoutaExceeded": "Upload quota exceeded", - "invalidImage": "Invalid image, try different file", + "rc_down": "Nicht genug Ressourcen-Credits, um eine Aktion auszuführen! \n\nBooste Deinen Account, um weiter zu genießen. Möchtest Du Deinen Account jetzt boosten?", + "payloadTooLarge": "Maximale Dateigröße überschritten. Bitte verkleinern oder kleineres Bild hochladen", + "qoutaExceeded": "Mengenkontingent überschritten", + "invalidImage": "Ungültiges Bild, versuchen Sie eine andere Datei", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", "something_wrong_reload": "Reload" @@ -433,7 +433,7 @@ "bookmarks": "Lesezeichen hinzufügen", "promote": "Promote", "boost": "Boost", - "report": "report" + "report": "Melden" }, "deep_link": { "no_existing_user": "Kein vorhandener Benutzer", From c25cafcc9dfa57c55c0987d0c1edfdf00e31f8c6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 4 Jan 2021 17:32:50 +0200 Subject: [PATCH 250/505] New translations en-US.json (German) --- src/config/locales/de-DE.json | 48 +++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 95336cee55..7c9a4f1a6c 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -2,7 +2,7 @@ "wallet": { "curation_reward": "Kuratoren-Belohnung", "author_reward": "Autoren-Belohnung", - "comment_benefactor_reward": "Benefactor Reward", + "comment_benefactor_reward": "Belohnung für den Gönner", "claim_reward_balance": "Belohnung abholen ", "transfer": "Überweisen", "transfer_to_vesting": "To Vesting", @@ -80,7 +80,7 @@ "delegate_vesting_shares": "Delegation", "fill_convert_request": "Konvertieren ausgeführt", "fill_transfer_from_savings": "Sparen ausgeführt", - "fill_vesting_withdraw": "PowerDown executed", + "fill_vesting_withdraw": "Powerdown ausgeführt", "estm": { "title": "eSteem Punkte", "buy": "PUNKTE ERHALTEN" @@ -214,7 +214,7 @@ "login": { "signin": "Anmelden", "signup": "JETZT ANMELDEN", - "signin_title": "To get all the benefits of using Ecency", + "signin_title": "Um alle Vorteile von Ecency zu erhalten", "username": "Benutzername", "password": "Passwort oder WIF", "description": "Wenn du dich anmeldest, stimmst du unseren Nutzungsbedingungen & und Datenschutzrichtlinien zu.", @@ -229,9 +229,9 @@ "username": "Wähle einen Benutzernamen", "mail": "E-Mail Adresse eingeben", "ref_user": "Empfohlener Benutzer (optional)", - "500_error": "Your request could not be processed, signup queue is likely full! Try again in few minutes...", + "500_error": "Ihre Anfrage konnte nicht verarbeitet werden, die Anmeldewarteschlange ist wahrscheinlich voll! Versuchen Sie es in wenigen Minuten noch einmal...", "title_description": "Ein Konto um alles zu verwalten", - "form_description": "By signing up with us, you agree to our Terms of Service and Privacy Policies." + "form_description": "Wenn du dich registrierst, stimmst du unseren Nutzungsbedingungen & und Datenschutzrichtlinien zu." }, "home": { "feed": "Feed", @@ -281,19 +281,19 @@ "capture_photo": "Ein Foto aufnehmen", "limited_tags": "Es sind nur 10 Tags erlaubt. Bitte entferne ein paar", "limited_length": "Tags dürfne nur 24 Zeichen lang sein", - "limited_dash": "Use one dash in each tag", + "limited_dash": "Maximal ein Bindestrich je Tag", "limited_space": "Benutze Leerzeichen, um Tags zu trennen", "limited_lowercase": "Tags müssen klein geschrieben sein", "limited_characters": "Verwende nur Kleinbuchstaben, Ziffern und max. einen Bindestrich", "limited_firstchar": "Tags müssen mit einem Buchstaben beginnen", "limited_lastchar": "Tags müssen mit einem Buchstaben oder einer Zahl enden", - "setting_schedule": "Scheduling Time", + "setting_schedule": "Geplante Zeit", "setting_reward": "Belohnung", - "setting_beneficiary": "Beneficiary", + "setting_beneficiary": "Begünstigter", "reward_default": "Standard 50% / 50%", "reward_power_up": "100% Power-Up", "reward_decline": "Auf die Auszahlung verzichten", - "beneficiaries": "Beneficiaries", + "beneficiaries": "Begünstigte", "options": "Optionen", "my_blog": "Mein Blog", "my_communities": "Meine Communitys", @@ -358,24 +358,24 @@ "payloadTooLarge": "Maximale Dateigröße überschritten. Bitte verkleinern oder kleineres Bild hochladen", "qoutaExceeded": "Mengenkontingent überschritten", "invalidImage": "Ungültiges Bild, versuchen Sie eine andere Datei", - "something_wrong": "Something went wrong.", - "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong": "Etwas ist schief gelaufen.", + "something_wrong_alt": "Probiere https://ecency.com", + "something_wrong_reload": "Aktualisieren" }, "post": { "reblog_alert": "Möchtest du diesen Beitrag wirklich teilen?", - "removed_hint": "Content is not available", - "copy_link": "Copy link", + "removed_hint": "Inhalt nicht verfügbar", + "copy_link": "Link kopieren", "reblogged": "rebloggt von", "sponsored": "Gesponsert", - "open_thread": "Open thread", - "image": "Image", + "open_thread": "Thread eröffnen", + "image": "Bild", "link": "Link", - "gallery_mode": "Gallery mode", - "save_to_local": "Download to device", - "image_saved": "Image saved to Photo Gallery", - "image_saved_error": "Error Saving Image", - "wrong_link": "Wrong link" + "gallery_mode": "Galerie-Modus", + "save_to_local": "Auf Gerät herunterladen", + "image_saved": "Bild in Galerie gespeichert", + "image_saved_error": "Fehler beim Speichern des Bildes", + "wrong_link": "Falscher Link" }, "drafts": { "title": "Entwürfe", @@ -421,7 +421,7 @@ "author_payout": "Autoren-Auszahlung", "curation_payout": "Kuratoren-Auszahlung", "payout_date": "Auszahlung", - "beneficiaries": "Beneficiaries", + "beneficiaries": "Begünstigte", "warn_zero_payout": "Betrag muss $0.02 für die Auszahlung erreichen", "breakdown": "Breakdown" }, @@ -460,7 +460,7 @@ "information": "Bist du sicher, dass du Geld überweisen willst?", "amount_desc": "Kontostand", "memo_desc": "Dieses Memo ist öffentlich", - "convert_desc": "Convert takes 3.5 days and NOT recommended IF HBD price is higher than $1", + "convert_desc": "Konvertieren dauert 3,5 Tage. NICHT zu empfehlen, wenn HBD-Preis höher als $1 ist.", "to_placeholder": "Benutzername", "memo_placeholder": "Hier dein Memo eingeben", "transfer_token": "Überweisen", @@ -493,7 +493,7 @@ "next": "WEITER", "account": { "title": "Konto-Boost erhalten", - "desc": "30 days delegation will boost your votes and social activities and give you more actions with more Resource Credits." + "desc": "Eine 30 Tage Delegation wird Deine Votes und sozialen Aktivitäten boosten und Dir mehr Aktionen mit mehr Ressource-Credits geben." } }, "free_estm": { From 8ce8c0ed8a1a6e15458e5a62dd5b9c0ef126107c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Mon, 4 Jan 2021 17:39:32 +0200 Subject: [PATCH 251/505] New translations en-US.json (German) --- src/config/locales/de-DE.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 7c9a4f1a6c..5fa28ceaa6 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -76,7 +76,7 @@ "escrow_dispute": "Escrow Dispute", "escrow_release": "Escrow Release", "escrow_approve": "Escrow Approve", - "cancel_transfer_from_savings": "Cancel From Savings", + "cancel_transfer_from_savings": "Abbrechen", "delegate_vesting_shares": "Delegation", "fill_convert_request": "Konvertieren ausgeführt", "fill_transfer_from_savings": "Sparen ausgeführt", @@ -475,7 +475,7 @@ "destination_accounts": "Zielkonten", "stop_information": "Möchtest du wirklich abbrechen?", "percent": "Prozent", - "auto_vests": "Auto Vests", + "auto_vests": "Auto-Vests", "save": "SPEICHERN", "percent_information": "Prozent Info", "next": "WEITER", From 776223aa95d762468700c3874113719988f80ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Tue, 5 Jan 2021 00:30:25 +0300 Subject: [PATCH 252/505] Fix schedule post feature according to the updated endpoint --- ios/Podfile.lock | 6 ++ package.json | 2 +- .../basicHeader/view/basicHeaderStyles.js | 4 + .../basicHeader/view/basicHeaderView.js | 48 ++++++++-- .../view/dateTimePickerStyles.js | 2 +- .../dateTimePicker/view/dateTimePickerView.js | 91 ++++--------------- src/components/modal/view/modalStyles.js | 5 + src/components/modal/view/modalView.js | 16 +++- src/config/locales/en-US.json | 3 +- src/providers/ecency/ecency.js | 10 +- .../editor/container/editorContainer.js | 68 +++++++++----- yarn.lock | 11 +-- 12 files changed, 142 insertions(+), 124 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e58eed3672..929a14e0d7 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -315,6 +315,8 @@ PODS: - react-native-config/App (= 1.3.3) - react-native-config/App (1.3.3): - React + - react-native-date-picker (3.2.7): + - React-Core - react-native-matomo-sdk (0.4.1): - MatomoTracker (~> 7) - React (~> 0.60) @@ -446,6 +448,7 @@ DEPENDENCIES: - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - "react-native-cameraroll (from `../node_modules/@react-native-community/cameraroll`)" - react-native-config (from `../node_modules/react-native-config`) + - react-native-date-picker (from `../node_modules/react-native-date-picker`) - react-native-matomo-sdk (from `../node_modules/react-native-matomo-sdk`) - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)" - react-native-receive-sharing-intent (from `../node_modules/react-native-receive-sharing-intent`) @@ -555,6 +558,8 @@ EXTERNAL SOURCES: :path: "../node_modules/@react-native-community/cameraroll" react-native-config: :path: "../node_modules/react-native-config" + react-native-date-picker: + :path: "../node_modules/react-native-date-picker" react-native-matomo-sdk: :path: "../node_modules/react-native-matomo-sdk" react-native-netinfo: @@ -668,6 +673,7 @@ SPEC CHECKSUMS: React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0 react-native-cameraroll: e2917a5e62da9f10c3d525e157e25e694d2d6dfa react-native-config: 9a061347e0136fdb32d43a34d60999297d672361 + react-native-date-picker: 5b66e04e7ed02478feb77a41d254ba24f120f956 react-native-matomo-sdk: 025c54f92e1e26a4d0acee7c3f28cb0fc7e4729c react-native-netinfo: a53b00d949b6456913aaf507d9dba90c4008c611 react-native-receive-sharing-intent: feba0a332a07977549a85aa58b496eb44368366a diff --git a/package.json b/package.json index e6d4c9e0fe..66b5ae62da 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "react-native-autoheight-webview": "^1.5.2", "react-native-config": "luggit/react-native-config#master", "react-native-dark-mode": "^0.2.2", - "react-native-datepicker": "ecency/react-native-datepicker", + "react-native-date-picker": "^3.2.7", "react-native-extended-stylesheet": "^0.10.0", "react-native-fast-image": "^8.3.2", "react-native-gesture-handler": "^1.4.1", diff --git a/src/components/basicHeader/view/basicHeaderStyles.js b/src/components/basicHeader/view/basicHeaderStyles.js index 5d7ab81398..b34b050528 100644 --- a/src/components/basicHeader/view/basicHeaderStyles.js +++ b/src/components/basicHeader/view/basicHeaderStyles.js @@ -80,4 +80,8 @@ export default EStyleSheet.create({ fontWeight: '500', width: '$deviceWidth / 1.4', }, + dateTimeModal: { + backgroundColor: '$primaryBackgroundColor', + alignItems: 'center', + }, }); diff --git a/src/components/basicHeader/view/basicHeaderView.js b/src/components/basicHeader/view/basicHeaderView.js index 4b0e87a125..5cd77a9c39 100644 --- a/src/components/basicHeader/view/basicHeaderView.js +++ b/src/components/basicHeader/view/basicHeaderView.js @@ -3,6 +3,7 @@ import { View, Text, ActivityIndicator, SafeAreaView } from 'react-native'; import { injectIntl } from 'react-intl'; import ActionSheet from 'react-native-actionsheet'; import { useSelector } from 'react-redux'; +import moment from 'moment'; // Components import { TextButton, Modal, BeneficiaryModal } from '../..'; @@ -48,6 +49,8 @@ const BasicHeaderView = ({ }) => { const [isInputVisible, setIsInputVisible] = useState(false); const [beneficiaryModal, setBeneficiaryModal] = useState(false); + const [showScheduleModal, setShowScheduleModal] = useState(false); + const [scheduledDate, setScheduledDate] = useState(''); const username = useSelector((state) => state.account.currentAccount.name); @@ -78,7 +81,7 @@ const BasicHeaderView = ({ const _handleSettingMenuSelect = (index) => { switch (index) { case 0: - scheduleRef.current.onPressDate(); + setShowScheduleModal(true); break; case 1: rewardMenuRef.current.show(); @@ -123,9 +126,19 @@ const BasicHeaderView = ({ }; const _handleDatePickerChange = (datePickerValue) => { - if (handleDatePickerChange) { - handleDatePickerChange(datePickerValue); + setScheduledDate(datePickerValue); + }; + + const _onPressDone = () => { + let dateString = scheduledDate; + + if (dateString === '') { + dateString = moment().format(); } + + setScheduledDate(''); + handleDatePickerChange(dateString); + setShowScheduleModal(false); }; return ( @@ -149,18 +162,11 @@ const BasicHeaderView = ({ disabled={disabled} /> )} - {!isInputVisible && ( {quickTitle || title} )} - {isHasDropdown && ( {dropdownComponent ? ( @@ -264,6 +270,28 @@ const BasicHeaderView = ({ handleOnSaveBeneficiaries={_handleOnSaveBeneficiaries} /> + setShowScheduleModal(false)} + > + + + + { - const [date, setDate] = useState(''); - const [time, setTime] = useState(''); - let _type; - let _format; - let _minDate; +const DateTimePickerView = React.forwardRef(({ type, iconName, disabled, onChanged }, ref) => { + const [androidDate, setAndroidDate] = useState(moment(Date.now())); - const intl = useIntl(); - const innerRef = useRef(null); - const datePickerRef = useCombinedRefs(ref, innerRef); + const _setDate = (date) => { + if (date) { + if (Platform.OS === 'android') { + setAndroidDate(date); + } - if (type === 'date-time') { - _type = date ? 'time' : 'date'; - _format = date ? 'HH:mm' : 'YYYY-MM-DD'; - _minDate = date ? null : moment().format('YYYY-MM-DD'); - } else { - _type = type; - _format = type === 'date' ? 'YYYY-MM-DD' : 'HH:mm'; - _minDate = type === 'date' ? moment().format('YYYY-MM-DD') : null; - } + const formattedDate = moment(date).format(); - const _initState = () => { - setDate(''); - setTime(''); - }; - - const _setValue = (setFunc, value) => { - const _value = value === 'Invalid date' ? moment().format('HH:mm:ss') : value; - setFunc(_value); - let timePickerTimeout; - - if (!time && !date) { - timePickerTimeout = setTimeout(() => { - datePickerRef.onPressDate(); - }, 500); - } else { - clearTimeout(timePickerTimeout); - } - - if (date && _value) { - const formatedDateTime = moment(`${date} ${_value}`, 'YYYY-MM-DD HH:mm').toISOString(); - onSubmit(formatedDateTime); - _initState(); + onChanged(formattedDate); } }; return ( _setValue(!date ? setDate : setTime, _datePickerValue)} - hideText - is24Hour - ref={datePickerRef} - disabled={disabled} - customStyles={{ - ...styles, - }} - showIcon={false} - // iconComponent={ - // // eslint-disable-next-line react/jsx-wrap-multilines - // - // } + minimumDate={Platform.OS === 'ios' ? new Date() : moment(Date.now())} + androidVariant="iosClone" + is24hourSource="device" /> ); }); -DateTimePickerView.defaultProps = { - iconName: 'timer', - type: 'date', -}; - export default DateTimePickerView; diff --git a/src/components/modal/view/modalStyles.js b/src/components/modal/view/modalStyles.js index a63af276ce..6460ec8f5b 100644 --- a/src/components/modal/view/modalStyles.js +++ b/src/components/modal/view/modalStyles.js @@ -18,6 +18,7 @@ export default EStyleSheet.create({ flexDirection: 'row', padding: 16, justifyContent: 'center', + alignItems: 'center', }, headerTitle: { color: '$primaryBlack', @@ -41,4 +42,8 @@ export default EStyleSheet.create({ margin: 0, backgroundColor: 'rgba(0,0,0,0.35)', }, + rightText: { + color: '$primaryBlack', + padding: 10, + }, }); diff --git a/src/components/modal/view/modalView.js b/src/components/modal/view/modalView.js index ac2480242a..27183cddae 100644 --- a/src/components/modal/view/modalView.js +++ b/src/components/modal/view/modalView.js @@ -1,5 +1,5 @@ import React, { PureComponent } from 'react'; -import { View, Text, SafeAreaView } from 'react-native'; +import { View, Text, TouchableOpacity } from 'react-native'; import ModalBox from 'react-native-modal'; import { IconButton } from '../../iconButton'; import styles from './modalStyles'; @@ -50,6 +50,9 @@ export default class Modal extends PureComponent { animationType = 'fade', isCloseButton, isBottomModal = false, + hasRightText = false, + rightText, + onPressRightText, } = this.props; return ( {title && ( - {title} + + {title} + {isCloseButton && ( this._handleOnClose()} /> )} + {hasRightText && ( + + {rightText} + + )} )} {children} diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 2fa5ae0caa..4dcc2e1a41 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter PIN to unlock", diff --git a/src/providers/ecency/ecency.js b/src/providers/ecency/ecency.js index b74c52b85e..9fa12ebc3f 100644 --- a/src/providers/ecency/ecency.js +++ b/src/providers/ecency/ecency.js @@ -307,20 +307,18 @@ export const schedule = ( operationType, upvote, scheduleDate, + options = null, ) => api .post('/schedules', { username: user, - category: tags[0], title, permlink, - json: jsonStringify(json), - tags, + meta: json, body, - post_type: operationType, - upvote_this: upvote, schedule: scheduleDate, - chain: 'hive', + options, + reblog: 0, }) .then((resp) => resp.data); diff --git a/src/screens/editor/container/editorContainer.js b/src/screens/editor/container/editorContainer.js index 0997a4d08d..a69915af60 100644 --- a/src/screens/editor/container/editorContainer.js +++ b/src/screens/editor/container/editorContainer.js @@ -336,6 +336,7 @@ class EditorContainer extends Component { permlink, fields, scheduleDate, + jsonMeta, }); } else { await postContent( @@ -595,46 +596,67 @@ class EditorContainer extends Component { _handleDatePickerChange = async (datePickerValue, fields) => { const { currentAccount, pinCode, intl } = this.props; - const json = get(currentAccount, 'posting_json_metadata', ''); + if (fields.title === '' && fields.body === '') { + const timer = setTimeout(() => { + Alert.alert( + intl.formatMessage({ + id: 'alert.fail', + }), + 'Title and body can not be empty', + ); + clearTimeout(timer); + }, 100); + } else { + const json = get(currentAccount, 'posting_json_metadata', ''); - let hasPostingPerm = false; + let hasPostingPerm = false; - if (currentAccount && currentAccount.posting) { - hasPostingPerm = - currentAccount.posting.account_auths.filter((x) => x[0] === 'ecency.app').length > 0; - } + if (currentAccount && currentAccount.posting) { + hasPostingPerm = + currentAccount.posting.account_auths.filter((x) => x[0] === 'ecency.app').length > 0; + } - if (hasPostingPerm) { - this._submitPost(fields, datePickerValue); - } else { - await grantPostingPermission(json, pinCode, currentAccount) - .then(() => { - this._submitPost(fields, datePickerValue); - }) - .catch((error) => { - Alert.alert( - intl.formatMessage({ - id: 'alert.fail', - }), - get(error, 'message', error.toString()), - ); - }); + if (hasPostingPerm) { + this._submitPost(fields, datePickerValue); + } else { + await grantPostingPermission(json, pinCode, currentAccount) + .then(() => { + this._submitPost(fields, datePickerValue); + }) + .catch((error) => { + Alert.alert( + intl.formatMessage({ + id: 'alert.fail', + }), + get(error, 'message', error.toString()), + ); + }); + } } }; _setScheduledPost = (data) => { const { dispatch, intl, currentAccount, navigation } = this.props; + const { rewardType, beneficiaries } = this.state; + + const options = makeOptions({ + author: data.author, + permlink: data.permlink, + operationType: rewardType, + beneficiaries: beneficiaries, + }); schedule( data.author, data.fields.title, data.permlink, - '', + data.jsonMeta, data.fields.tags, data.fields.body, '', '', data.scheduleDate, + options, ) .then(() => { this.setState({ @@ -662,7 +684,7 @@ class EditorContainer extends Component { }); }, 3000); }) - .catch(() => { + .catch((err) => { this.setState({ isPostSending: false, }); diff --git a/yarn.lock b/yarn.lock index 8004bf2aab..6d3da8f86d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6440,7 +6440,7 @@ mkdirp@~1.0.3: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -moment@^2.22.0, moment@^2.22.2: +moment@^2.22.2: version "2.27.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d" integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ== @@ -7493,11 +7493,10 @@ react-native-dark-mode@^0.2.2: events "^3.0.0" toolkit.ts "^0.0.2" -react-native-datepicker@ecency/react-native-datepicker: - version "1.7.2" - resolved "https://codeload.github.com/ecency/react-native-datepicker/tar.gz/844955f20ede921e6a8b83d95c58167970f9279b" - dependencies: - moment "^2.22.0" +react-native-date-picker@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/react-native-date-picker/-/react-native-date-picker-3.2.7.tgz#1708c2fc712c09ce6eaca007635a036dba4ca107" + integrity sha512-7JXwnEF4TxST6+yKYzscCxx8BWQLBpNVxUmVYbaXkhdLSTO1QlypukVeQMZ9QtuRAhf4zs3NDiYqZDu9JdeGAA== react-native-extended-stylesheet@^0.10.0: version "0.10.0" From 7155836061d856c03311ccff672d9e21474b7903 Mon Sep 17 00:00:00 2001 From: feruzm Date: Tue, 5 Jan 2021 16:08:26 +0200 Subject: [PATCH 253/505] post thumbnail fix, wp vote bar on sidemenu --- src/components/postCard/view/postCardView.js | 7 ++++++- src/components/sideMenu/view/sideMenuView.js | 16 +++++++++++++++- src/utils/manaBar.js | 14 ++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/src/components/postCard/view/postCardView.js b/src/components/postCard/view/postCardView.js index 530271c33d..ed2f091ce0 100644 --- a/src/components/postCard/view/postCardView.js +++ b/src/components/postCard/view/postCardView.js @@ -102,7 +102,12 @@ const PostCardView = ({ {!isHideImage && ( - + )} {content.title} diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index 0d7cef88c7..86534cb09c 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -18,11 +18,15 @@ import Modal from '../../modal'; import { Icon } from '../../icon'; import { UserAvatar } from '../../userAvatar'; import Separator from '../../basicUIElements/view/separator/separatorView'; +import { PercentBar } from '../../percentBar'; // Constants import MENU from '../../../constants/sideMenuItems'; import { default as ROUTES } from '../../../constants/routeNames'; +//Utils +import { getRcPower, getVotingPower } from '../../../utils/manaBar'; + // Styles import styles from './sideMenuStyles'; import { TextButton } from '../../buttons'; @@ -73,9 +77,18 @@ const SideMenuView = ({ const _toggleAccountsModalOpen = () => { setIsAccountsModalOpen(!isAccountsModalOpen); }; - + let votingPowerText = ''; + let rcPowerText = ''; + let votingPower = 0; + let resourceCredits = 0; useEffect(() => { setMenuItems(isLoggedIn ? MENU.AUTH_MENU_ITEMS : MENU.NO_AUTH_MENU_ITEMS); + if (isLoggedIn) { + votingPower = getVotingPower(currentAccount).toFixed(1); + resourceCredits = getRcPower(currentAccount).toFixed(1); + votingPowerText = `Voting power: ${votingPower}%`; + rcPowerText = `Resource Credits: ${resourceCredits}%`; + } }, [isLoggedIn]); const { buildVersion, appVersion } = VersionNumber; @@ -175,6 +188,7 @@ const SideMenuView = ({ + {votingPowerText} item.id} renderItem={_renderItem} /> {`v${appVersion}, ${buildVersion}${storageT}`} diff --git a/src/utils/manaBar.js b/src/utils/manaBar.js index db7aa58c15..8baf5e712d 100644 --- a/src/utils/manaBar.js +++ b/src/utils/manaBar.js @@ -14,3 +14,17 @@ export const getRcPower = (account) => { const { percentage } = rc_manabar; return percentage / 100; }; + +export const getDownVotingPower = (account) => { + const curMana = Number(account.voting_manabar.current_mana); + const curDownMana = Number(account.downvote_manabar.current_mana); + const downManaLastUpdate = account.downvote_manabar.last_update_time; + + const downVotePerc = curDownMana / (curMana / (account.voting_power / 100) / 4); + + const secondsDiff = (Date.now() - downManaLastUpdate * 1000) / 1000; + + const pow = downVotePerc * 100 + (10000 * secondsDiff) / 432000; + + return Math.min(pow / 100, 100); +}; From a005cae01375b1fc12005a39be0e2d0064fca11f Mon Sep 17 00:00:00 2001 From: feruzm Date: Tue, 5 Jan 2021 19:34:35 +0200 Subject: [PATCH 254/505] add vp info --- .../sideMenu/view/sideMenuStyles.js | 9 ++++-- src/components/sideMenu/view/sideMenuView.js | 30 +++++++++++-------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/components/sideMenu/view/sideMenuStyles.js b/src/components/sideMenu/view/sideMenuStyles.js index 81eaf51fb3..a9b832daf7 100644 --- a/src/components/sideMenu/view/sideMenuStyles.js +++ b/src/components/sideMenu/view/sideMenuStyles.js @@ -41,14 +41,14 @@ export default EStyleSheet.create({ username: { color: '$pureWhite', fontWeight: 'bold', - fontSize: scalePx(16), + fontSize: scalePx(18), marginBottom: 8, maxWidth: '$deviceWidth / 3', }, usernick: { color: 'rgba(255, 255, 255, 0.7)', fontWeight: 'bold', - fontSize: scalePx(14), + fontSize: scalePx(18), marginTop: 2, }, listItem: { @@ -90,6 +90,11 @@ export default EStyleSheet.create({ textAlign: 'center', color: '$iconColor', }, + vpText: { + textAlign: 'center', + fontSize: scalePx(16), + color: '$iconColor', + }, imageBackground: { width: '100%', height: '100%', diff --git a/src/components/sideMenu/view/sideMenuView.js b/src/components/sideMenu/view/sideMenuView.js index 86534cb09c..f347348e7d 100644 --- a/src/components/sideMenu/view/sideMenuView.js +++ b/src/components/sideMenu/view/sideMenuView.js @@ -18,14 +18,14 @@ import Modal from '../../modal'; import { Icon } from '../../icon'; import { UserAvatar } from '../../userAvatar'; import Separator from '../../basicUIElements/view/separator/separatorView'; -import { PercentBar } from '../../percentBar'; +import { TextWithIcon } from '../../basicUIElements'; // Constants import MENU from '../../../constants/sideMenuItems'; import { default as ROUTES } from '../../../constants/routeNames'; //Utils -import { getRcPower, getVotingPower } from '../../../utils/manaBar'; +import { getVotingPower } from '../../../utils/manaBar'; // Styles import styles from './sideMenuStyles'; @@ -50,6 +50,7 @@ const SideMenuView = ({ ); const [storageT, setStorageT] = useState('R'); const [isAccountsModalOpen, setIsAccountsModalOpen] = useState(false); + const [upower, setUpower] = useState(0); // Component Life Cycles useEffect(() => { @@ -64,6 +65,12 @@ const SideMenuView = ({ }; }, []); + useEffect(() => { + if (isLoggedIn) { + setUpower(getVotingPower(currentAccount).toFixed(1)); + } + }); + // Component Functions const _handleOnMenuItemPress = (item) => { if (item.id === 'logout') { @@ -77,18 +84,9 @@ const SideMenuView = ({ const _toggleAccountsModalOpen = () => { setIsAccountsModalOpen(!isAccountsModalOpen); }; - let votingPowerText = ''; - let rcPowerText = ''; - let votingPower = 0; - let resourceCredits = 0; + useEffect(() => { setMenuItems(isLoggedIn ? MENU.AUTH_MENU_ITEMS : MENU.NO_AUTH_MENU_ITEMS); - if (isLoggedIn) { - votingPower = getVotingPower(currentAccount).toFixed(1); - resourceCredits = getRcPower(currentAccount).toFixed(1); - votingPowerText = `Voting power: ${votingPower}%`; - rcPowerText = `Resource Credits: ${resourceCredits}%`; - } }, [isLoggedIn]); const { buildVersion, appVersion } = VersionNumber; @@ -172,6 +170,13 @@ const SideMenuView = ({ {`@${_username}`} + @@ -188,7 +193,6 @@ const SideMenuView = ({ - {votingPowerText} item.id} renderItem={_renderItem} /> {`v${appVersion}, ${buildVersion}${storageT}`} From f6915114bab29c99103c1e4105f76e3cf63c4deb Mon Sep 17 00:00:00 2001 From: feruzm Date: Tue, 5 Jan 2021 19:41:55 +0200 Subject: [PATCH 255/505] fix voting error message --- src/components/upvote/view/upvoteView.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/upvote/view/upvoteView.js b/src/components/upvote/view/upvoteView.js index 56d1bb5c03..430f8d6438 100644 --- a/src/components/upvote/view/upvoteView.js +++ b/src/components/upvote/view/upvoteView.js @@ -126,18 +126,18 @@ class UpvoteView extends Component { dispatch(setRcOffer(true)); } else { //when voting with same percent or other errors - Alert.alert( + /*Alert.alert( intl.formatMessage({ id: 'alert.fail', }), JSON.stringify(err), - ); - if (err.jse_shortmsg.indexOf(':') > 0) { + );*/ + if (err.message && err.message.indexOf(':') > 0) { Alert.alert( intl.formatMessage({ id: 'alert.fail', }), - err.error_description.split(': ')[1], + err.message.split(': ')[1], ); } else { Alert.alert( From 9ec729c1f163d21c4951cb3b8f4e353304b292cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Tue, 5 Jan 2021 20:54:06 +0300 Subject: [PATCH 256/505] Fix for DateTimePickerView --- .../view/dateTimePickerStyles.js | 3 +++ .../dateTimePicker/view/dateTimePickerView.js | 22 ++++++++++--------- src/utils/getLocale.js | 15 +++++++++++++ 3 files changed, 30 insertions(+), 10 deletions(-) create mode 100644 src/utils/getLocale.js diff --git a/src/components/dateTimePicker/view/dateTimePickerStyles.js b/src/components/dateTimePicker/view/dateTimePickerStyles.js index 9daeb7bb7c..5f116c61c6 100644 --- a/src/components/dateTimePicker/view/dateTimePickerStyles.js +++ b/src/components/dateTimePicker/view/dateTimePickerStyles.js @@ -37,4 +37,7 @@ export default EStyleSheet.create({ width: '$deviceWidth', // marginLeft: 20, }, + datePickerText: { + color: '$primaryBlack', + }, }); diff --git a/src/components/dateTimePicker/view/dateTimePickerView.js b/src/components/dateTimePicker/view/dateTimePickerView.js index a91b887a39..7211641016 100644 --- a/src/components/dateTimePicker/view/dateTimePickerView.js +++ b/src/components/dateTimePicker/view/dateTimePickerView.js @@ -9,32 +9,34 @@ import useCombinedRefs from '../../../customHooks/useCombinedRefs'; // Component import { Icon } from '../../icon'; +// Utils +import getLocale from '../../../utils/getLocale'; + // Styles import styles from './dateTimePickerStyles'; const DateTimePickerView = React.forwardRef(({ type, iconName, disabled, onChanged }, ref) => { - const [androidDate, setAndroidDate] = useState(moment(Date.now())); - - const _setDate = (date) => { - if (date) { - if (Platform.OS === 'android') { - setAndroidDate(date); - } + const [date, setDate] = useState(new Date()); - const formattedDate = moment(date).format(); + const _setDate = (_date) => { + if (_date) { + const formattedDate = moment(_date).format(); + setDate(_date); onChanged(formattedDate); } }; return ( ); }); diff --git a/src/utils/getLocale.js b/src/utils/getLocale.js new file mode 100644 index 0000000000..8cd4b3f008 --- /dev/null +++ b/src/utils/getLocale.js @@ -0,0 +1,15 @@ +import { NativeModules, Platform } from 'react-native'; + +export default () => { + let locale = ''; + + if (Platform.OS === 'ios') { + locale = + NativeModules.SettingsManager.settings.AppleLocale || + NativeModules.SettingsManager.settings.AppleLanguages[0]; + } else { + locale = NativeModules.I18nManager.localeIdentifier; + } + + return locale; +}; From 358c6ecee8acdd0969cb7ba67d49cbb98c0b100a Mon Sep 17 00:00:00 2001 From: feruzm Date: Tue, 5 Jan 2021 19:58:56 +0200 Subject: [PATCH 257/505] add editor table markdown --- src/components/markdownEditor/view/formats/formats.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/markdownEditor/view/formats/formats.js b/src/components/markdownEditor/view/formats/formats.js index c48deea148..f87e19b4e7 100644 --- a/src/components/markdownEditor/view/formats/formats.js +++ b/src/components/markdownEditor/view/formats/formats.js @@ -31,9 +31,11 @@ export default [ { key: 'L', title: 'L', - icon: 'list', + icon: 'table', iconType: 'FontAwesome', - prefix: '-', + prefix: `| Column1 | Column2 | +| ------------ | ------------ | +| Text | Text |`, onPress: applyListFormat, }, { From c7be3982c27f8438884b841a30cbc59c45bf142e Mon Sep 17 00:00:00 2001 From: feruzm Date: Tue, 5 Jan 2021 21:38:06 +0200 Subject: [PATCH 258/505] profile page style improvement --- .../collapsibleCard/view/collapsibleCardStyles.js | 2 +- src/components/profile/profileStyles.js | 2 +- src/components/profile/profileView.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/collapsibleCard/view/collapsibleCardStyles.js b/src/components/collapsibleCard/view/collapsibleCardStyles.js index a6807e1b24..f918edc72e 100644 --- a/src/components/collapsibleCard/view/collapsibleCardStyles.js +++ b/src/components/collapsibleCard/view/collapsibleCardStyles.js @@ -4,7 +4,7 @@ export default EStyleSheet.create({ container: { flexDirection: 'column', backgroundColor: '$primaryBackgroundColor', - marginTop: 8, + //marginTop: 8, overflow: 'hidden', }, containerWithBorder: { diff --git a/src/components/profile/profileStyles.js b/src/components/profile/profileStyles.js index 270193b5dd..208a567ab6 100644 --- a/src/components/profile/profileStyles.js +++ b/src/components/profile/profileStyles.js @@ -40,7 +40,7 @@ export default EStyleSheet.create({ height: 45, backgroundColor: '$primaryBackgroundColor', borderBottomColor: '#f1f1f1', - marginTop: 8, + //marginTop: 8, }, tabView: { backgroundColor: '$primaryGrayBackground', diff --git a/src/components/profile/profileView.js b/src/components/profile/profileView.js index 79e0f492d8..4f84adcdac 100644 --- a/src/components/profile/profileView.js +++ b/src/components/profile/profileView.js @@ -119,14 +119,14 @@ class ProfileView extends PureComponent { } = this.state; return ( - +
- + {!isReady ? ( ) : ( @@ -268,8 +268,8 @@ class ProfileView extends PureComponent { )} - - + + ); } } From 3932a3265eaa7c9fd16887e3916f77a1c70d46fd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:25 +0200 Subject: [PATCH 259/505] New translations en-US.json (Bengali) --- src/config/locales/bn-BD.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bn-BD.json b/src/config/locales/bn-BD.json index f09bbf130f..b60149e826 100644 --- a/src/config/locales/bn-BD.json +++ b/src/config/locales/bn-BD.json @@ -297,7 +297,8 @@ "options": "বিকল্পগুলি", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From cd03580f3ff1539fc5fc60f64ecc181e2d4a15e5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:27 +0200 Subject: [PATCH 260/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 0dacd9cee2..964a76b3a5 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -297,7 +297,8 @@ "options": "Valikud", "my_blog": "Minu blogi", "my_communities": "Minu kogukonnad", - "top_communities": "Top kogukonnad" + "top_communities": "Top kogukonnad", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 95b470ec8620185c437cb26b1c0ee37483c149f7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:28 +0200 Subject: [PATCH 261/505] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index 40fedbe35d..58491f12b5 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -297,7 +297,8 @@ "options": "Mga Pagpipilian", "my_blog": "Aking blog", "my_communities": "Aking mga pamayanan", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From df2e58f281b3f302f3e54b67db8cccd9618888b6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:30 +0200 Subject: [PATCH 262/505] New translations en-US.json (Esperanto) --- src/config/locales/eo-UY.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/eo-UY.json b/src/config/locales/eo-UY.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/eo-UY.json +++ b/src/config/locales/eo-UY.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From ce3d788840156e517f78fbe312ad003c5231fbcb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:32 +0200 Subject: [PATCH 263/505] New translations en-US.json (Malay) --- src/config/locales/ms-MY.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ms-MY.json b/src/config/locales/ms-MY.json index e65fd6f2e9..eea220c8f9 100644 --- a/src/config/locales/ms-MY.json +++ b/src/config/locales/ms-MY.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 8b9c6e3e3dd473c134545adeea06309efc825176 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:34 +0200 Subject: [PATCH 264/505] New translations en-US.json (Kyrgyz) --- src/config/locales/ky-KG.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ky-KG.json b/src/config/locales/ky-KG.json index 556f282edd..dff674d00c 100644 --- a/src/config/locales/ky-KG.json +++ b/src/config/locales/ky-KG.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 0511c56f80d675249a84dfd72d510c39ddf7e975 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:36 +0200 Subject: [PATCH 265/505] New translations en-US.json (Azerbaijani) --- src/config/locales/az-AZ.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/az-AZ.json b/src/config/locales/az-AZ.json index ad0a08f0a6..f97481462f 100644 --- a/src/config/locales/az-AZ.json +++ b/src/config/locales/az-AZ.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "Bloqum", "my_communities": "Cəmiyyətlərim", - "top_communities": "Başlıca Cəmiyyətlər" + "top_communities": "Başlıca Cəmiyyətlər", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Kilidi açmaq üçün PIN-i daxil et", From 01a4b2535b59e97793ea8694709f744d596fc32c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:38 +0200 Subject: [PATCH 266/505] New translations en-US.json (Latvian) --- src/config/locales/lv-LV.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/lv-LV.json b/src/config/locales/lv-LV.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/lv-LV.json +++ b/src/config/locales/lv-LV.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 557fe5972b71955eb5106558a346a50b47a71f38 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:40 +0200 Subject: [PATCH 267/505] New translations en-US.json (Kazakh) --- src/config/locales/kk-KZ.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/kk-KZ.json b/src/config/locales/kk-KZ.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/kk-KZ.json +++ b/src/config/locales/kk-KZ.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 34c1d3ec7a24873b977b9dba642d132b3dbf7e4b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:41 +0200 Subject: [PATCH 268/505] New translations en-US.json (Bosnian) --- src/config/locales/bs-BA.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bs-BA.json b/src/config/locales/bs-BA.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/bs-BA.json +++ b/src/config/locales/bs-BA.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 9e3f5ce170f1a97d00b1a262d97c76584593484a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:43 +0200 Subject: [PATCH 269/505] New translations en-US.json (Croatian) --- src/config/locales/hr-HR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hr-HR.json b/src/config/locales/hr-HR.json index 9018ed127d..ce52ed858b 100644 --- a/src/config/locales/hr-HR.json +++ b/src/config/locales/hr-HR.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 8277582d60b6b2ef6bb2ef29e898e31630f51b10 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:45 +0200 Subject: [PATCH 270/505] New translations en-US.json (Thai) --- src/config/locales/th-TH.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/th-TH.json b/src/config/locales/th-TH.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/th-TH.json +++ b/src/config/locales/th-TH.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 1fa833d4dfa03de1bb13cdcd9587dba606309724 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:47 +0200 Subject: [PATCH 271/505] New translations en-US.json (Tamil) --- src/config/locales/ta-IN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ta-IN.json b/src/config/locales/ta-IN.json index 42efad8ff6..08f4601eb8 100644 --- a/src/config/locales/ta-IN.json +++ b/src/config/locales/ta-IN.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From e6266c4e8a238713099896ba2baf1889bf136a26 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:49 +0200 Subject: [PATCH 272/505] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 6e2931fe6c..2a4ebd30eb 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From b6784505d6bf2d805e3cf6a11af0bb6cccb5b6fb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:51 +0200 Subject: [PATCH 273/505] New translations en-US.json (Indonesian) --- src/config/locales/id-ID.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/id-ID.json b/src/config/locales/id-ID.json index 33398e2201..83a221835a 100644 --- a/src/config/locales/id-ID.json +++ b/src/config/locales/id-ID.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Masukkan PIN untuk membuka kunci", From 72b36c9c7ed8776bbf2148d8a3a25a5f223333ac Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:52 +0200 Subject: [PATCH 274/505] New translations en-US.json (Icelandic) --- src/config/locales/is-IS.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/is-IS.json b/src/config/locales/is-IS.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/is-IS.json +++ b/src/config/locales/is-IS.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 93ef41385428c33900cd41f760ebf1f888a53e2a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:55 +0200 Subject: [PATCH 275/505] New translations en-US.json (Galician) --- src/config/locales/gl-ES.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/gl-ES.json b/src/config/locales/gl-ES.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/gl-ES.json +++ b/src/config/locales/gl-ES.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 6f0a21f58a39f1178f194cb70cc9e439c8479705 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:56 +0200 Subject: [PATCH 276/505] New translations en-US.json (Tibetan) --- src/config/locales/bo-BT.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bo-BT.json b/src/config/locales/bo-BT.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/bo-BT.json +++ b/src/config/locales/bo-BT.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 6cca4af56685315e1bf7f37195462de90ee83500 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:17:58 +0200 Subject: [PATCH 277/505] New translations en-US.json (Uzbek) --- src/config/locales/uz-UZ.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/uz-UZ.json b/src/config/locales/uz-UZ.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/uz-UZ.json +++ b/src/config/locales/uz-UZ.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 4bd23905c52d9f9d32087b80453c0e97236e5a30 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:00 +0200 Subject: [PATCH 278/505] New translations en-US.json (Urdu (Pakistan)) --- src/config/locales/ur-PK.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ur-PK.json b/src/config/locales/ur-PK.json index 58152ea820..e0ee190510 100644 --- a/src/config/locales/ur-PK.json +++ b/src/config/locales/ur-PK.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter PIN to unlock", From a096687ec752b095b78a51586176adfe408e2dda Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:02 +0200 Subject: [PATCH 279/505] New translations en-US.json (Sanskrit) --- src/config/locales/sa-IN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sa-IN.json b/src/config/locales/sa-IN.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/sa-IN.json +++ b/src/config/locales/sa-IN.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From a4ee47d20b2f8d3b754c226532df12287a0318a9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:04 +0200 Subject: [PATCH 280/505] New translations en-US.json (Spanish, Argentina) --- src/config/locales/es-AR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/es-AR.json b/src/config/locales/es-AR.json index 2fa5ae0caa..4dcc2e1a41 100644 --- a/src/config/locales/es-AR.json +++ b/src/config/locales/es-AR.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter PIN to unlock", From b1f55f9ba9098bad6a8f34804db0bb6026f3ebfd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:06 +0200 Subject: [PATCH 281/505] New translations en-US.json (Acehnese) --- src/config/locales/ac-ace.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ac-ace.json b/src/config/locales/ac-ace.json index bd06a10751..4e55ed66bd 100644 --- a/src/config/locales/ac-ace.json +++ b/src/config/locales/ac-ace.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Pasöe gunci untuk buka", From 94ceed95bef7437469f4057d7bb420ea38e2c717 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:08 +0200 Subject: [PATCH 282/505] New translations en-US.json (Urdu (India)) --- src/config/locales/ur-IN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ur-IN.json b/src/config/locales/ur-IN.json index 58152ea820..e0ee190510 100644 --- a/src/config/locales/ur-IN.json +++ b/src/config/locales/ur-IN.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter PIN to unlock", From ba8681ab3a15421fc45513ad52bd63b8d029ddde Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:10 +0200 Subject: [PATCH 283/505] New translations en-US.json (Kabyle) --- src/config/locales/kab-KAB.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/kab-KAB.json b/src/config/locales/kab-KAB.json index 0fdf8f0635..973cb96f03 100644 --- a/src/config/locales/kab-KAB.json +++ b/src/config/locales/kab-KAB.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Sekcem tangalt PIN i tildin", From 4fc5c45a71f6f74a524e3fe52b7797239db4b506 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:11 +0200 Subject: [PATCH 284/505] New translations en-US.json (Gothic) --- src/config/locales/got-DE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/got-DE.json b/src/config/locales/got-DE.json index 2895e51c98..94de00b97f 100644 --- a/src/config/locales/got-DE.json +++ b/src/config/locales/got-DE.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Melei PIN du uslukan", From 846e9c5301bb46fba1d18f34c692718a7163d5a8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:13 +0200 Subject: [PATCH 285/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index defad67be4..441309e0a4 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -297,7 +297,8 @@ "options": "Plenty way", "my_blog": "My personal blog dem", "my_communities": "Una areas", - "top_communities": "Areas wey dey lead" + "top_communities": "Areas wey dey lead", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter your PIN to open am", From 5754c9021a5b91c57a817285b63e4a1e9ec6a656 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:15 +0200 Subject: [PATCH 286/505] New translations en-US.json (Turkmen) --- src/config/locales/tk-TM.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/tk-TM.json b/src/config/locales/tk-TM.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/tk-TM.json +++ b/src/config/locales/tk-TM.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 803b1441e99ec88ee8488c8a40eb92cf17f4f2a6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:17 +0200 Subject: [PATCH 287/505] New translations en-US.json (Assamese) --- src/config/locales/as-IN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/as-IN.json b/src/config/locales/as-IN.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/as-IN.json +++ b/src/config/locales/as-IN.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From d8a8759dd36b721b04bd3a8b1c1d43283fcc9dc1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:19 +0200 Subject: [PATCH 288/505] New translations en-US.json (Kashmiri) --- src/config/locales/ks-IN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ks-IN.json b/src/config/locales/ks-IN.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/ks-IN.json +++ b/src/config/locales/ks-IN.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 99192a207dd0d31bc3af5a75ce2b55060a4f8e84 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:21 +0200 Subject: [PATCH 289/505] New translations en-US.json (Cebuano) --- src/config/locales/ceb-PH.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ceb-PH.json b/src/config/locales/ceb-PH.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/ceb-PH.json +++ b/src/config/locales/ceb-PH.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From acb38d17ef852446b311c80f7427e1769583909b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:23 +0200 Subject: [PATCH 290/505] New translations en-US.json (Yoruba) --- src/config/locales/yo-NG.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/yo-NG.json b/src/config/locales/yo-NG.json index 5123aeb3e2..83f339ed83 100644 --- a/src/config/locales/yo-NG.json +++ b/src/config/locales/yo-NG.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Te PIN re lati si", From 4d6e80a145a547c582cad5f93b0d526bc83f0ae2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:25 +0200 Subject: [PATCH 291/505] New translations en-US.json (Tajik) --- src/config/locales/tg-TJ.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/tg-TJ.json b/src/config/locales/tg-TJ.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/tg-TJ.json +++ b/src/config/locales/tg-TJ.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From fc657a45d0f10ff32c7421726ec4c1a71459181e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:27 +0200 Subject: [PATCH 292/505] New translations en-US.json (Nepali) --- src/config/locales/ne-NP.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ne-NP.json b/src/config/locales/ne-NP.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/ne-NP.json +++ b/src/config/locales/ne-NP.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 379388d050a943c294cd414f8a84276e3a78f781 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:29 +0200 Subject: [PATCH 293/505] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index 235c78e5bf..d90ae03ca2 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -297,7 +297,8 @@ "options": "Opcije", "my_blog": "Moj Blog", "my_communities": "Moje Zajednice", - "top_communities": "Najpopularnije zajednice" + "top_communities": "Najpopularnije zajednice", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Unesite PIN da otključate", From 7eaa81bbc0d46c07e904f6de71221156c4024fee Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:30 +0200 Subject: [PATCH 294/505] New translations en-US.json (Swahili) --- src/config/locales/sw-KE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sw-KE.json b/src/config/locales/sw-KE.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/sw-KE.json +++ b/src/config/locales/sw-KE.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 2ea5329d3f91e53e68b06643aa4cf453ac319e0f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:32 +0200 Subject: [PATCH 295/505] New translations en-US.json (Vietnamese) --- src/config/locales/vi-VN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/vi-VN.json b/src/config/locales/vi-VN.json index 9e67b9fe45..05abcd73d3 100644 --- a/src/config/locales/vi-VN.json +++ b/src/config/locales/vi-VN.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Nhập mã PIN để mở khóa", From f8b28ea91b1ea0f30100b013140088d521ef7fbe Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:34 +0200 Subject: [PATCH 296/505] New translations en-US.json (Chinese Traditional) --- src/config/locales/zh-TW.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/zh-TW.json b/src/config/locales/zh-TW.json index acbf53d832..81e38a919a 100644 --- a/src/config/locales/zh-TW.json +++ b/src/config/locales/zh-TW.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "輸入PIN碼解鎖", From 630e657377c4ac5f2945bf681e3a16d7f8fa4a17 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:36 +0200 Subject: [PATCH 297/505] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index e1c96b9fcd..e7bb681c6d 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -297,7 +297,8 @@ "options": "विकल्प", "my_blog": "मेरा ब्लॉग", "my_communities": "मेरे समुदाय", - "top_communities": "शीर्ष समुदाय" + "top_communities": "शीर्ष समुदाय", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "खोलनें के लिए पिन डालें", From 84c2dd269c3d113fe627dfd9756f1c3f5f7cffd3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:38 +0200 Subject: [PATCH 298/505] New translations en-US.json (German) --- src/config/locales/de-DE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 5fa28ceaa6..633297b659 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -297,7 +297,8 @@ "options": "Optionen", "my_blog": "Mein Blog", "my_communities": "Meine Communitys", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "PIN zum Entsperren eingeben", From 69a5b63cea158c7aaef0587dfd14626faa0971af Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:40 +0200 Subject: [PATCH 299/505] New translations en-US.json (Armenian) --- src/config/locales/hy-AM.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hy-AM.json b/src/config/locales/hy-AM.json index 44b6aed4e6..b9333f90e8 100644 --- a/src/config/locales/hy-AM.json +++ b/src/config/locales/hy-AM.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From c6fc5c04f953b9528d260cd9bf915d93900af788 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:42 +0200 Subject: [PATCH 300/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 13af4c18d5..ac50099590 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -297,7 +297,8 @@ "options": "Opciók", "my_blog": "Saját blog", "my_communities": "Közösségeim", - "top_communities": "Top közösségek" + "top_communities": "Top közösségek", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Feloldáshoz írd be a PIN kódot", From 3be43afca543df80c73f8469cdf3cbbd86f50084 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:44 +0200 Subject: [PATCH 301/505] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index f3ecb35d6e..d6671c0635 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "תקליד\\י PIN כדי לבטל נעילה", From c3567b3d0e8cb19ddb8ea10cef0fd9a0031e0190 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:45 +0200 Subject: [PATCH 302/505] New translations en-US.json (Irish) --- src/config/locales/ga-IE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ga-IE.json b/src/config/locales/ga-IE.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/ga-IE.json +++ b/src/config/locales/ga-IE.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 6eab471c910ea3ad9f854ae836a92d398ef72c74 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:47 +0200 Subject: [PATCH 303/505] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index 163cdf9f26..d2edbc1ecd 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -297,7 +297,8 @@ "options": "Asetukset", "my_blog": "Oma Blogi", "my_communities": "Yhteisöni", - "top_communities": "Suosituimmat Yhteisöt" + "top_communities": "Suosituimmat Yhteisöt", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Poista lukitus antamalla PIN-koodi", From cbf77e4d55a6b23ce7e4b2d34568519376aaf1d3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:49 +0200 Subject: [PATCH 304/505] New translations en-US.json (Greek) --- src/config/locales/el-GR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/el-GR.json b/src/config/locales/el-GR.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/el-GR.json +++ b/src/config/locales/el-GR.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From ee256f1f84a2d4ef47883c4ffdf6ab575f83ad39 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:51 +0200 Subject: [PATCH 305/505] New translations en-US.json (Danish) --- src/config/locales/da-DK.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/da-DK.json b/src/config/locales/da-DK.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/da-DK.json +++ b/src/config/locales/da-DK.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 7ce429099daa9aa9e683f98b3c286ab2775d48b4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:53 +0200 Subject: [PATCH 306/505] New translations en-US.json (Japanese) --- src/config/locales/ja-JP.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ja-JP.json b/src/config/locales/ja-JP.json index 12709f81a6..7df99fa3c4 100644 --- a/src/config/locales/ja-JP.json +++ b/src/config/locales/ja-JP.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "PIN を入力してロックを解除", From 8e7243efa50f28d506b32ad19bdcc522e45880c0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:55 +0200 Subject: [PATCH 307/505] New translations en-US.json (Czech) --- src/config/locales/cs-CZ.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/cs-CZ.json b/src/config/locales/cs-CZ.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/cs-CZ.json +++ b/src/config/locales/cs-CZ.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From ac5a9a3d3cbee91d67a845f0ea27816c5aa9266b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:57 +0200 Subject: [PATCH 308/505] New translations en-US.json (Catalan) --- src/config/locales/ca-ES.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ca-ES.json b/src/config/locales/ca-ES.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/ca-ES.json +++ b/src/config/locales/ca-ES.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 6a07a3a55bd2ea7b2730a6cf13f704dc7186a1a8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:18:59 +0200 Subject: [PATCH 309/505] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index b3c4444e98..2d52c42cc5 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Вкарай Пин-код за отключване", From 508ce8f22f9abebc50a623f2c65049eb27e24403 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:00 +0200 Subject: [PATCH 310/505] New translations en-US.json (Arabic) --- src/config/locales/ar-SA.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json index 1edde01d92..0c9b4600e2 100644 --- a/src/config/locales/ar-SA.json +++ b/src/config/locales/ar-SA.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "أدخل الرقم السري للفتح", From e93b4d4999d2f3f79c4326311b8a1adb19fe675e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:02 +0200 Subject: [PATCH 311/505] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index 2dd031b0d1..2dbad257d8 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -297,7 +297,8 @@ "options": "Opciones", "my_blog": "Mi blog", "my_communities": "Mis comunidades", - "top_communities": "Comunidades" + "top_communities": "Comunidades", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From f0b96d97092f5603cc20c486d49e7b4f3de8b2d4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:04 +0200 Subject: [PATCH 312/505] New translations en-US.json (Romanian) --- src/config/locales/ro-RO.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ro-RO.json b/src/config/locales/ro-RO.json index c320bce01f..5fc79b811c 100644 --- a/src/config/locales/ro-RO.json +++ b/src/config/locales/ro-RO.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 9815a684b9e3450b22cc4d0bed9809fbe5e27727 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:06 +0200 Subject: [PATCH 313/505] New translations en-US.json (French) --- src/config/locales/fr-FR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/fr-FR.json b/src/config/locales/fr-FR.json index b3344000fe..1b7e4e990c 100644 --- a/src/config/locales/fr-FR.json +++ b/src/config/locales/fr-FR.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From fa67501d9e693911a862d33cfc1cf3076e9c5a26 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:08 +0200 Subject: [PATCH 314/505] New translations en-US.json (Italian) --- src/config/locales/it-IT.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/it-IT.json b/src/config/locales/it-IT.json index 50b57bce8b..2a533e90e3 100644 --- a/src/config/locales/it-IT.json +++ b/src/config/locales/it-IT.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Inserisci il PIN per sbloccare", From 29a6ca8ccb3df363bb2e5ddcec344fab88b72e0a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:10 +0200 Subject: [PATCH 315/505] New translations en-US.json (Georgian) --- src/config/locales/ka-GE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ka-GE.json b/src/config/locales/ka-GE.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/ka-GE.json +++ b/src/config/locales/ka-GE.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 82cbbee785e5b14d6e58e7915f9a5b4caf62d4bd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:12 +0200 Subject: [PATCH 316/505] New translations en-US.json (Chinese Simplified) --- src/config/locales/zh-CN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/zh-CN.json b/src/config/locales/zh-CN.json index a2df2937a0..512cc1b04d 100644 --- a/src/config/locales/zh-CN.json +++ b/src/config/locales/zh-CN.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "输入 PIN 解锁", From 2c651f2b436b632426fce6c391a9690918c474fc Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:14 +0200 Subject: [PATCH 317/505] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index 5242397955..e9aa7734a4 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -297,7 +297,8 @@ "options": "Opções", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Insira PIN para desbloquear", From 733f17f921f8cf029ba5071f7aa9dfa907b7f70e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:16 +0200 Subject: [PATCH 318/505] New translations en-US.json (Ukrainian) --- src/config/locales/uk-UA.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/uk-UA.json b/src/config/locales/uk-UA.json index b422054523..eddd29e458 100644 --- a/src/config/locales/uk-UA.json +++ b/src/config/locales/uk-UA.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Для розблокування введіть пін-код", From 7c9a70ddcc12865c9f0643c8dac7d686c0917ffa Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:18 +0200 Subject: [PATCH 319/505] New translations en-US.json (Turkish) --- src/config/locales/tr-TR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/tr-TR.json b/src/config/locales/tr-TR.json index f15a70c296..3d99e8b0ec 100644 --- a/src/config/locales/tr-TR.json +++ b/src/config/locales/tr-TR.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Açmak için pin kodunu giriniz", From 0301ae4a048b858db89482a9ac29206aaedce05e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:20 +0200 Subject: [PATCH 320/505] New translations en-US.json (Swedish) --- src/config/locales/sv-SE.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sv-SE.json b/src/config/locales/sv-SE.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/sv-SE.json +++ b/src/config/locales/sv-SE.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 7dc90f7cb0631202c0fa9baaed45c968a80b7c75 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:22 +0200 Subject: [PATCH 321/505] New translations en-US.json (Albanian) --- src/config/locales/sq-AL.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sq-AL.json b/src/config/locales/sq-AL.json index 44b6aed4e6..b9333f90e8 100644 --- a/src/config/locales/sq-AL.json +++ b/src/config/locales/sq-AL.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From e40fc895fcd407cdd9cbba8d51c6495999230dc6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:23 +0200 Subject: [PATCH 322/505] New translations en-US.json (Slovenian) --- src/config/locales/sl-SI.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sl-SI.json b/src/config/locales/sl-SI.json index 4e416335b7..7d05185967 100644 --- a/src/config/locales/sl-SI.json +++ b/src/config/locales/sl-SI.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 59adb4d766d3a9c500cdcfdf43f2c816038318ed Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:25 +0200 Subject: [PATCH 323/505] New translations en-US.json (Slovak) --- src/config/locales/sk-SK.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/sk-SK.json b/src/config/locales/sk-SK.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/sk-SK.json +++ b/src/config/locales/sk-SK.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From ecb6cfd16a8dc702e2f1957f6c1efbf3e903db7c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:27 +0200 Subject: [PATCH 324/505] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index a6f4f62f42..9a15ca174c 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Чтобы разблокировать введите пин-код", From 8ab48e97f3c53ba2b8519ba7818a7a74fa80a923 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:29 +0200 Subject: [PATCH 325/505] New translations en-US.json (Polish) --- src/config/locales/pl-PL.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pl-PL.json b/src/config/locales/pl-PL.json index f0c2055b56..d76937a720 100644 --- a/src/config/locales/pl-PL.json +++ b/src/config/locales/pl-PL.json @@ -297,7 +297,8 @@ "options": "Opcje", "my_blog": "Mój blog", "my_communities": "Moje społeczności", - "top_communities": "Najlepsze społeczności" + "top_communities": "Najlepsze społeczności", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 9044809599d442c1e86614b715832788ec8dc5a5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:31 +0200 Subject: [PATCH 326/505] New translations en-US.json (Korean) --- src/config/locales/ko-KR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ko-KR.json b/src/config/locales/ko-KR.json index 0282c7b4ad..f6e8ad657e 100644 --- a/src/config/locales/ko-KR.json +++ b/src/config/locales/ko-KR.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "잠금을 해제하려면 PIN 코드를 입력해주세요", From 604285637dd7c18c67a1623dfc12a6aa60ca5fce Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:34 +0200 Subject: [PATCH 327/505] New translations en-US.json (Punjabi) --- src/config/locales/pa-IN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/pa-IN.json b/src/config/locales/pa-IN.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/pa-IN.json +++ b/src/config/locales/pa-IN.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From dda3aa0c2e4bff7a5a024867908343a6f490dc06 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:36 +0200 Subject: [PATCH 328/505] New translations en-US.json (Norwegian) --- src/config/locales/no-NO.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/no-NO.json b/src/config/locales/no-NO.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/no-NO.json +++ b/src/config/locales/no-NO.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 88355b8133464e4ee82114b660046efd743eedec Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:38 +0200 Subject: [PATCH 329/505] New translations en-US.json (Dutch) --- src/config/locales/nl-NL.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/nl-NL.json b/src/config/locales/nl-NL.json index 29a7101c1c..8afd9da365 100644 --- a/src/config/locales/nl-NL.json +++ b/src/config/locales/nl-NL.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter PIN om te ontgrendelen", From 290edecfd7ce34a1dc92e43a431df1d175fbe07d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:40 +0200 Subject: [PATCH 330/505] New translations en-US.json (Mongolian) --- src/config/locales/mn-MN.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/mn-MN.json b/src/config/locales/mn-MN.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/mn-MN.json +++ b/src/config/locales/mn-MN.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From 09aba48d616b5dc1f6925e49a33dfdbe4549e429 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:42 +0200 Subject: [PATCH 331/505] New translations en-US.json (Macedonian) --- src/config/locales/mk-MK.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/mk-MK.json b/src/config/locales/mk-MK.json index 87a414a58c..c4717a8059 100644 --- a/src/config/locales/mk-MK.json +++ b/src/config/locales/mk-MK.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From dbacd736bf1640d26bf9a1af49edbfd4cbf6f999 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:44 +0200 Subject: [PATCH 332/505] New translations en-US.json (Lithuanian) --- src/config/locales/lt-LT.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/lt-LT.json b/src/config/locales/lt-LT.json index e8c3d5508b..8cafec5bf2 100644 --- a/src/config/locales/lt-LT.json +++ b/src/config/locales/lt-LT.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter pin to unlock", From c4e14fcf67ca4607498b4703d38dde2fb374ea89 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:46 +0200 Subject: [PATCH 333/505] New translations en-US.json (Kurdish) --- src/config/locales/ku-TR.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/ku-TR.json b/src/config/locales/ku-TR.json index 01a5255bc2..fd84f8996d 100644 --- a/src/config/locales/ku-TR.json +++ b/src/config/locales/ku-TR.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Ji bo vekirinê PINê bikevê", From e2a660f30617c2ea0199b3b7b5108b2749288954 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:19:48 +0200 Subject: [PATCH 334/505] New translations en-US.json (Spanish, Mexico) --- src/config/locales/es-MX.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/es-MX.json b/src/config/locales/es-MX.json index 2fa5ae0caa..4dcc2e1a41 100644 --- a/src/config/locales/es-MX.json +++ b/src/config/locales/es-MX.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter PIN to unlock", From d2686b51067908653796730b350610616753ef68 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:28:19 +0200 Subject: [PATCH 335/505] Update source file en-US.json --- src/config/locales/en-US.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 2fa5ae0caa..4dcc2e1a41 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -297,7 +297,8 @@ "options": "Options", "my_blog": "My Blog", "my_communities": "My Communities", - "top_communities": "Top Communities" + "top_communities": "Top Communities", + "schedule_modal_title": "Schedule Post" }, "pincode": { "enter_text": "Enter PIN to unlock", From 96814869871a2f5bd1f1aa9afb22d54e87955075 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Tue, 5 Jan 2021 22:57:59 +0200 Subject: [PATCH 336/505] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index d90ae03ca2..3d49dbe44e 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -298,7 +298,7 @@ "my_blog": "Moj Blog", "my_communities": "Moje Zajednice", "top_communities": "Najpopularnije zajednice", - "schedule_modal_title": "Schedule Post" + "schedule_modal_title": "Planiraj objavu" }, "pincode": { "enter_text": "Unesite PIN da otključate", From 9baeee412b1e75228e9cf09dfbb3cb36e645de9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Wed, 6 Jan 2021 00:09:21 +0300 Subject: [PATCH 337/505] Add localization for empty body or title alert --- src/config/locales/en-US.json | 3 ++- src/screens/editor/container/editorContainer.js | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 4dcc2e1a41..b607fda959 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", diff --git a/src/screens/editor/container/editorContainer.js b/src/screens/editor/container/editorContainer.js index a69915af60..937ce3093d 100644 --- a/src/screens/editor/container/editorContainer.js +++ b/src/screens/editor/container/editorContainer.js @@ -596,13 +596,15 @@ class EditorContainer extends Component { _handleDatePickerChange = async (datePickerValue, fields) => { const { currentAccount, pinCode, intl } = this.props; - if (fields.title === '' && fields.body === '') { + if (fields.title === '' || fields.body === '') { const timer = setTimeout(() => { Alert.alert( intl.formatMessage({ id: 'alert.fail', }), - 'Title and body can not be empty', + intl.formatMessage({ + id: 'alert.can_not_be_empty', + }), ); clearTimeout(timer); }, 100); From 7d293d3bc78467de74f48e201279d561954124f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Wed, 6 Jan 2021 01:02:32 +0300 Subject: [PATCH 338/505] Reorganize searchResult screen --- src/components/tabBar/view/tabBarView.js | 4 ++- src/config/locales/en-US.json | 10 ++++++- .../searchResult/screen/searchResultScreen.js | 26 +++++++++++++------ .../searchResult/screen/searchResultStyles.js | 3 +++ .../screen/{ => tabs/best}/postResult.js | 10 +++---- .../{ => tabs/best}/postResultStyles.js | 0 .../communities}/CommunitiesListItem.js | 2 +- .../{ => tabs/communities}/communities.js | 12 ++++----- .../{ => tabs/communities}/communitiesList.js | 4 +-- .../communities}/communitiesListItemStyles.js | 0 .../communities}/communitiesListStyles.js | 0 .../screen/{ => tabs/topics}/otherResults.js | 8 +++--- .../{ => tabs/topics}/otherResultsStyles.js | 0 13 files changed, 50 insertions(+), 29 deletions(-) rename src/screens/searchResult/screen/{ => tabs/best}/postResult.js (90%) rename src/screens/searchResult/screen/{ => tabs/best}/postResultStyles.js (100%) rename src/screens/searchResult/screen/{ => tabs/communities}/CommunitiesListItem.js (97%) rename src/screens/searchResult/screen/{ => tabs/communities}/communities.js (89%) rename src/screens/searchResult/screen/{ => tabs/communities}/communitiesList.js (90%) rename src/screens/searchResult/screen/{ => tabs/communities}/communitiesListItemStyles.js (100%) rename src/screens/searchResult/screen/{ => tabs/communities}/communitiesListStyles.js (100%) rename src/screens/searchResult/screen/{ => tabs/topics}/otherResults.js (91%) rename src/screens/searchResult/screen/{ => tabs/topics}/otherResultsStyles.js (100%) diff --git a/src/components/tabBar/view/tabBarView.js b/src/components/tabBar/view/tabBarView.js index 50c7b538da..9741fb1955 100644 --- a/src/components/tabBar/view/tabBarView.js +++ b/src/components/tabBar/view/tabBarView.js @@ -32,6 +32,8 @@ class TabBar extends PureComponent { _renderTab = (name, page, isTabActive, onPressHandler) => { const { activeColor, inactiveColor } = this.state; + const { textStyle } = this.props; + const textColor = isTabActive ? activeColor : inactiveColor; const fontWeight = isTabActive ? 'bold' : 'normal'; const Button = Platform.OS === 'ios' ? ButtonIos : ButtonAndroid; @@ -47,7 +49,7 @@ class TabBar extends PureComponent { onPress={() => onPressHandler(page)} > - {name} + {name} ); diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index b607fda959..a101ec578c 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -538,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", diff --git a/src/screens/searchResult/screen/searchResultScreen.js b/src/screens/searchResult/screen/searchResultScreen.js index d174bfbca8..99f28f3216 100644 --- a/src/screens/searchResult/screen/searchResultScreen.js +++ b/src/screens/searchResult/screen/searchResultScreen.js @@ -5,9 +5,9 @@ import { useIntl } from 'react-intl'; // Components import { SearchInput, TabBar } from '../../../components'; -import Communities from './communities'; -import PostResult from './postResult'; -import OtherResult from './otherResults'; +import Communities from './tabs/communities/communities'; +import PostResult from './tabs/best/postResult'; +import OtherResult from './tabs/topics/otherResults'; // Styles import styles from './searchResultStyles'; @@ -36,6 +36,7 @@ const SearchResultScreen = ({ navigation }) => { tabUnderlineDefaultWidth={80} tabUnderlineScaleX={2} tabBarPosition="overlayTop" + textStyle={styles.tabBarText} /> ); @@ -54,20 +55,29 @@ const SearchResultScreen = ({ navigation }) => { prerenderingSiblingsNumber={Infinity} > - - - + + + + + + ); diff --git a/src/screens/searchResult/screen/searchResultStyles.js b/src/screens/searchResult/screen/searchResultStyles.js index 0ef7bc05b2..2c4a24638a 100644 --- a/src/screens/searchResult/screen/searchResultStyles.js +++ b/src/screens/searchResult/screen/searchResultStyles.js @@ -28,4 +28,7 @@ export default EStyleSheet.create({ tabs: { flex: 1, }, + tabBarText: { + fontSize: 14, + }, }); diff --git a/src/screens/searchResult/screen/postResult.js b/src/screens/searchResult/screen/tabs/best/postResult.js similarity index 90% rename from src/screens/searchResult/screen/postResult.js rename to src/screens/searchResult/screen/tabs/best/postResult.js index 83c5f67cd7..d49a3fd424 100644 --- a/src/screens/searchResult/screen/postResult.js +++ b/src/screens/searchResult/screen/tabs/best/postResult.js @@ -6,15 +6,15 @@ import FastImage from 'react-native-fast-image'; import { useIntl } from 'react-intl'; // Components -import { PostHeaderDescription, FilterBar } from '../../../components'; -import { TextWithIcon, CommunitiesPlaceHolder } from '../../../components/basicUIElements'; -import PostResultContainer from '../container/postResultContainer'; +import { PostHeaderDescription, FilterBar } from '../../../../../components'; +import { TextWithIcon, CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; +import PostResultContainer from '../../../container/postResultContainer'; -import { getTimeFromNow } from '../../../utils/time'; +import { getTimeFromNow } from '../../../../../utils/time'; import styles from './postResultStyles'; -import DEFAULT_IMAGE from '../../../assets/no_image.png'; +import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; const filterOptions = ['relevance', 'popularity', 'newest']; diff --git a/src/screens/searchResult/screen/postResultStyles.js b/src/screens/searchResult/screen/tabs/best/postResultStyles.js similarity index 100% rename from src/screens/searchResult/screen/postResultStyles.js rename to src/screens/searchResult/screen/tabs/best/postResultStyles.js diff --git a/src/screens/searchResult/screen/CommunitiesListItem.js b/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js similarity index 97% rename from src/screens/searchResult/screen/CommunitiesListItem.js rename to src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js index 0a70871c3b..10de0c140e 100644 --- a/src/screens/searchResult/screen/CommunitiesListItem.js +++ b/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js @@ -4,7 +4,7 @@ import { useIntl } from 'react-intl'; import styles from './communitiesListItemStyles'; -import { Tag } from '../../../components/basicUIElements'; +import { Tag } from '../../../../../components/basicUIElements'; const UserListItem = ({ index, diff --git a/src/screens/searchResult/screen/communities.js b/src/screens/searchResult/screen/tabs/communities/communities.js similarity index 89% rename from src/screens/searchResult/screen/communities.js rename to src/screens/searchResult/screen/tabs/communities/communities.js index b3a615e296..d053585528 100644 --- a/src/screens/searchResult/screen/communities.js +++ b/src/screens/searchResult/screen/tabs/communities/communities.js @@ -4,14 +4,14 @@ import { FlatList, View, Text, TouchableOpacity } from 'react-native'; import get from 'lodash/get'; // Components -import { FilterBar, UserAvatar } from '../../../components'; +import { FilterBar, UserAvatar } from '../../../../../components'; import CommunitiesList from './communitiesList'; -import { CommunitiesPlaceHolder } from '../../../components/basicUIElements'; +import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; -import CommunitiesContainer from '../container/communitiesContainer'; -import styles from './otherResultsStyles'; -import DEFAULT_IMAGE from '../../../assets/no_image.png'; -import Tag from '../../../components/basicUIElements/view/tag/tagView'; +import CommunitiesContainer from '../../../container/communitiesContainer'; +import styles from '../topics/otherResultsStyles'; +import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; +import Tag from '../../../../../components/basicUIElements/view/tag/tagView'; const filterOptions = ['my', 'rank', 'subs', 'new']; diff --git a/src/screens/searchResult/screen/communitiesList.js b/src/screens/searchResult/screen/tabs/communities/communitiesList.js similarity index 90% rename from src/screens/searchResult/screen/communitiesList.js rename to src/screens/searchResult/screen/tabs/communities/communitiesList.js index c6be73ddfd..da58020abc 100644 --- a/src/screens/searchResult/screen/communitiesList.js +++ b/src/screens/searchResult/screen/tabs/communities/communitiesList.js @@ -2,8 +2,8 @@ import React from 'react'; import { SafeAreaView, FlatList } from 'react-native'; // Components -import { CommunityListItem } from '../../../components/basicUIElements'; -import { CommunitiesPlaceHolder } from '../../../components/basicUIElements'; +import { CommunityListItem } from '../../../../../components/basicUIElements'; +import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; // Styles import styles from './communitiesListStyles'; diff --git a/src/screens/searchResult/screen/communitiesListItemStyles.js b/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js similarity index 100% rename from src/screens/searchResult/screen/communitiesListItemStyles.js rename to src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js diff --git a/src/screens/searchResult/screen/communitiesListStyles.js b/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js similarity index 100% rename from src/screens/searchResult/screen/communitiesListStyles.js rename to src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js diff --git a/src/screens/searchResult/screen/otherResults.js b/src/screens/searchResult/screen/tabs/topics/otherResults.js similarity index 91% rename from src/screens/searchResult/screen/otherResults.js rename to src/screens/searchResult/screen/tabs/topics/otherResults.js index 6b837bbad0..aa3c948f0b 100644 --- a/src/screens/searchResult/screen/otherResults.js +++ b/src/screens/searchResult/screen/tabs/topics/otherResults.js @@ -3,14 +3,12 @@ import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-nati import { useIntl } from 'react-intl'; // Components -import { FilterBar, UserAvatar } from '../../../components'; -import { CommunitiesPlaceHolder, UserListItem } from '../../../components/basicUIElements'; -import OtherResultContainer from '../container/otherResultContainer'; +import { FilterBar, UserAvatar } from '../../../../../components'; +import { CommunitiesPlaceHolder, UserListItem } from '../../../../../components/basicUIElements'; +import OtherResultContainer from '../../../container/otherResultContainer'; import styles from './otherResultsStyles'; -import DEFAULT_IMAGE from '../../../assets/no_image.png'; - const filterOptions = ['user', 'tag']; const OtherResult = ({ navigation, searchValue }) => { diff --git a/src/screens/searchResult/screen/otherResultsStyles.js b/src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js similarity index 100% rename from src/screens/searchResult/screen/otherResultsStyles.js rename to src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js From 90f6ec610f339f46217d90628a8af1b17899f109 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 03:05:30 +0200 Subject: [PATCH 339/505] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index 2dbad257d8..81da74ff85 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -298,7 +298,7 @@ "my_blog": "Mi blog", "my_communities": "Mis comunidades", "top_communities": "Comunidades", - "schedule_modal_title": "Schedule Post" + "schedule_modal_title": "Programar publicación" }, "pincode": { "enter_text": "Enter pin to unlock", From 527bba937622656d6eff1a03acb9136e24ca7d39 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 10:39:43 +0200 Subject: [PATCH 340/505] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index d2edbc1ecd..692b71db98 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -298,7 +298,7 @@ "my_blog": "Oma Blogi", "my_communities": "Yhteisöni", "top_communities": "Suosituimmat Yhteisöt", - "schedule_modal_title": "Schedule Post" + "schedule_modal_title": "Ajasta julkaisu" }, "pincode": { "enter_text": "Poista lukitus antamalla PIN-koodi", From 153e94bcfc591d9e25f791ade82567751b61b8f0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 16:41:01 +0200 Subject: [PATCH 341/505] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index e7bb681c6d..d1969af319 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -298,7 +298,7 @@ "my_blog": "मेरा ब्लॉग", "my_communities": "मेरे समुदाय", "top_communities": "शीर्ष समुदाय", - "schedule_modal_title": "Schedule Post" + "schedule_modal_title": "पोस्ट शेड्यूल करें" }, "pincode": { "enter_text": "खोलनें के लिए पिन डालें", From bf7641e6a8a684f71c0472e5b7d16db45b92d4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Furkan=20K=C4=B1l=C4=B1c=CC=A7?= Date: Thu, 7 Jan 2021 00:06:38 +0300 Subject: [PATCH 342/505] Fix editor screen scroll --- src/components/markdownEditor/view/markdownEditorStyles.js | 5 ++--- src/components/markdownEditor/view/markdownEditorView.js | 2 +- src/components/sideMenu/view/sideMenuView.js | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/markdownEditor/view/markdownEditorStyles.js b/src/components/markdownEditor/view/markdownEditorStyles.js index ea81491c51..0286b6ea16 100644 --- a/src/components/markdownEditor/view/markdownEditorStyles.js +++ b/src/components/markdownEditor/view/markdownEditorStyles.js @@ -7,15 +7,14 @@ export default EStyleSheet.create({ backgroundColor: '$primaryBackgroundColor', }, textWrapper: { - flex: 1, fontSize: 12, paddingTop: 16, paddingBottom: 0, // On android side, textinput has default padding paddingHorizontal: 16, color: '$primaryBlack', backgroundColor: '$primaryBackgroundColor', - fontFamily: '$editorFont', - textAlignVertical: 'top', + // fontFamily: '$editorFont', + //textAlignVertical: 'top', }, previewContainer: { flex: 1, diff --git a/src/components/markdownEditor/view/markdownEditorView.js b/src/components/markdownEditor/view/markdownEditorView.js index 57afa665c7..7a86fc73b1 100644 --- a/src/components/markdownEditor/view/markdownEditorView.js +++ b/src/components/markdownEditor/view/markdownEditorView.js @@ -260,7 +260,7 @@ const MarkdownEditorView = ({ {currentAccount.display_name && ( From caabb6fc2e34e37e947739aab7c5f1be09f1a55f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:36 +0200 Subject: [PATCH 343/505] New translations en-US.json (Bengali) --- src/config/locales/bn-BD.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/bn-BD.json b/src/config/locales/bn-BD.json index b60149e826..9986990a18 100644 --- a/src/config/locales/bn-BD.json +++ b/src/config/locales/bn-BD.json @@ -361,7 +361,8 @@ "invalidImage": "ইনভ্যালিড চিত্র, ভিন্ন ফাইল চেষ্টা করুন", "something_wrong": "কিছু ভুল হয়েছে", "something_wrong_alt": "চেষ্টা করুন https://ecency.com", - "something_wrong_reload": "রিলোড" + "something_wrong_reload": "রিলোড", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "আপনি কি নিশ্চিত যে আপনি পুনরায় ব্লগ করতে চান?", @@ -537,7 +538,15 @@ "more_replies": "আরও উত্তর" }, "search_result": { - "others": "অন্যান্য", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "কমিউনিটি", "subscribe": "Join", From fbd90a9a725159df5842ea294ba0c167d0d76bee Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:38 +0200 Subject: [PATCH 344/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 964a76b3a5..946b80de59 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Midagi läks valesti.", "something_wrong_alt": "Proovi https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Oled sa kindel, et soovid seda jagada?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 88433cc054b28482268210c289ab3d93b9d4d3ba Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:40 +0200 Subject: [PATCH 345/505] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index 58491f12b5..471e6ae04b 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -361,7 +361,8 @@ "invalidImage": "Inbalidong imahe, subukan ang ibang file", "something_wrong": "May nangyaring problema.", "something_wrong_alt": "Subukan ang https://ecency.com", - "something_wrong_reload": "I-reload" + "something_wrong_reload": "I-reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Sigurado ka, gusto mong i-reblog?", @@ -537,7 +538,15 @@ "more_replies": "mas maraming tugon" }, "search_result": { - "others": "Iba Pa", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Mga pamayanan", "subscribe": "Sumali", From b6e65f026d5214e150b1cec2ff23f8e8047816a2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:42 +0200 Subject: [PATCH 346/505] New translations en-US.json (Esperanto) --- src/config/locales/eo-UY.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/eo-UY.json b/src/config/locales/eo-UY.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/eo-UY.json +++ b/src/config/locales/eo-UY.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 41e0e81fe94e378a700800a3c5855d3dcf9820a9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:44 +0200 Subject: [PATCH 347/505] New translations en-US.json (Malay) --- src/config/locales/ms-MY.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ms-MY.json b/src/config/locales/ms-MY.json index eea220c8f9..4f3804c289 100644 --- a/src/config/locales/ms-MY.json +++ b/src/config/locales/ms-MY.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From d53127bbcbdd9a04eb07018ad49aedbd70332b94 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:46 +0200 Subject: [PATCH 348/505] New translations en-US.json (Kyrgyz) --- src/config/locales/ky-KG.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ky-KG.json b/src/config/locales/ky-KG.json index dff674d00c..03de1c4408 100644 --- a/src/config/locales/ky-KG.json +++ b/src/config/locales/ky-KG.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Башка", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From eb486d41f3f16b5ea4a661cbe9035fe872076fee Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:47 +0200 Subject: [PATCH 349/505] New translations en-US.json (Azerbaijani) --- src/config/locales/az-AZ.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/az-AZ.json b/src/config/locales/az-AZ.json index f97481462f..22a087d976 100644 --- a/src/config/locales/az-AZ.json +++ b/src/config/locales/az-AZ.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Təkrar paylaşmaq istədiyinizə əminsiniz?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 7f470a3f5d208d6be4910a6e2892a03feb6e927e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:49 +0200 Subject: [PATCH 350/505] New translations en-US.json (Latvian) --- src/config/locales/lv-LV.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/lv-LV.json b/src/config/locales/lv-LV.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/lv-LV.json +++ b/src/config/locales/lv-LV.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From b183b4bd849796b6f0ab85599750cf2efe13b86d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:51 +0200 Subject: [PATCH 351/505] New translations en-US.json (Kazakh) --- src/config/locales/kk-KZ.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/kk-KZ.json b/src/config/locales/kk-KZ.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/kk-KZ.json +++ b/src/config/locales/kk-KZ.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 481ed9c68c0293cd623992a13f7b4f75fa288a41 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:53 +0200 Subject: [PATCH 352/505] New translations en-US.json (Bosnian) --- src/config/locales/bs-BA.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/bs-BA.json b/src/config/locales/bs-BA.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/bs-BA.json +++ b/src/config/locales/bs-BA.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 8b129aff1c9c3c3aadab7aa5f937e0aa8a9f678e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:55 +0200 Subject: [PATCH 353/505] New translations en-US.json (Croatian) --- src/config/locales/hr-HR.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/hr-HR.json b/src/config/locales/hr-HR.json index ce52ed858b..1ef9ee2c4a 100644 --- a/src/config/locales/hr-HR.json +++ b/src/config/locales/hr-HR.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 1da05a0af38a31efd2f87b282a75e96263a6770f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:57 +0200 Subject: [PATCH 354/505] New translations en-US.json (Thai) --- src/config/locales/th-TH.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/th-TH.json b/src/config/locales/th-TH.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/th-TH.json +++ b/src/config/locales/th-TH.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 396b0c7a61950ca5efa89ef3a3a7aa0094cbe309 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:56:59 +0200 Subject: [PATCH 355/505] New translations en-US.json (Tamil) --- src/config/locales/ta-IN.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ta-IN.json b/src/config/locales/ta-IN.json index 08f4601eb8..8b4ae01488 100644 --- a/src/config/locales/ta-IN.json +++ b/src/config/locales/ta-IN.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 869ae907b6648e58e24f128b27357f1360f634bd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:01 +0200 Subject: [PATCH 356/505] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 2a4ebd30eb..7443656cd9 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From cfdf70cb902df0d9b8295927310cfcc6a24fa25b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:03 +0200 Subject: [PATCH 357/505] New translations en-US.json (Indonesian) --- src/config/locales/id-ID.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/id-ID.json b/src/config/locales/id-ID.json index 83a221835a..dd132be3fb 100644 --- a/src/config/locales/id-ID.json +++ b/src/config/locales/id-ID.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Anda yakin, anda ingin me-reblog?", @@ -537,7 +538,15 @@ "more_replies": "lebih banyak balasan" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From a4fa58a9ac43d06b6210456ecf17611b43e0adb3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:05 +0200 Subject: [PATCH 358/505] New translations en-US.json (Icelandic) --- src/config/locales/is-IS.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/is-IS.json b/src/config/locales/is-IS.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/is-IS.json +++ b/src/config/locales/is-IS.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 23c04186d7ae8fcd3c78a7f2a1c4d57ddd20acc4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:07 +0200 Subject: [PATCH 359/505] New translations en-US.json (Galician) --- src/config/locales/gl-ES.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/gl-ES.json b/src/config/locales/gl-ES.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/gl-ES.json +++ b/src/config/locales/gl-ES.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 0884e92a00fe6af90b0e48a6500d58fd9565e2b7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:09 +0200 Subject: [PATCH 360/505] New translations en-US.json (Tibetan) --- src/config/locales/bo-BT.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/bo-BT.json b/src/config/locales/bo-BT.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/bo-BT.json +++ b/src/config/locales/bo-BT.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From e11f39a470ee2540e245c9db886096a23790f02e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:11 +0200 Subject: [PATCH 361/505] New translations en-US.json (Uzbek) --- src/config/locales/uz-UZ.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/uz-UZ.json b/src/config/locales/uz-UZ.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/uz-UZ.json +++ b/src/config/locales/uz-UZ.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 533d5f96459f300f743d872ac54169bc7956eab2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:13 +0200 Subject: [PATCH 362/505] New translations en-US.json (Urdu (Pakistan)) --- src/config/locales/ur-PK.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ur-PK.json b/src/config/locales/ur-PK.json index e0ee190510..8076931752 100644 --- a/src/config/locales/ur-PK.json +++ b/src/config/locales/ur-PK.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From dc42103f630fcf9ec7f6a8dddc92c9357db933f7 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:15 +0200 Subject: [PATCH 363/505] New translations en-US.json (Sanskrit) --- src/config/locales/sa-IN.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/sa-IN.json b/src/config/locales/sa-IN.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/sa-IN.json +++ b/src/config/locales/sa-IN.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 928e8b4c85cb4715ded7fb50780bebc506fe1bd4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:16 +0200 Subject: [PATCH 364/505] New translations en-US.json (Spanish, Argentina) --- src/config/locales/es-AR.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/es-AR.json b/src/config/locales/es-AR.json index 4dcc2e1a41..a101ec578c 100644 --- a/src/config/locales/es-AR.json +++ b/src/config/locales/es-AR.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 90e6ac80d5d7c9d810b8f0b5c9ed033d2d23e58e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:18 +0200 Subject: [PATCH 365/505] New translations en-US.json (Acehnese) --- src/config/locales/ac-ace.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ac-ace.json b/src/config/locales/ac-ace.json index 4e55ed66bd..d5c52f2d2d 100644 --- a/src/config/locales/ac-ace.json +++ b/src/config/locales/ac-ace.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 21fb81a68d05798f27fb9896b2dac7733e86da55 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:20 +0200 Subject: [PATCH 366/505] New translations en-US.json (Urdu (India)) --- src/config/locales/ur-IN.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ur-IN.json b/src/config/locales/ur-IN.json index e0ee190510..8076931752 100644 --- a/src/config/locales/ur-IN.json +++ b/src/config/locales/ur-IN.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From d0ba059d99a717c7127b1f7c81f73511debe5959 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:22 +0200 Subject: [PATCH 367/505] New translations en-US.json (Kabyle) --- src/config/locales/kab-KAB.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/kab-KAB.json b/src/config/locales/kab-KAB.json index 973cb96f03..8efbe49c0b 100644 --- a/src/config/locales/kab-KAB.json +++ b/src/config/locales/kab-KAB.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Tebɣiḍ s tidet ad as-tɛawdeḍ asuffeɣ?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 415d74f52722fb7ea3ce5c5f101f1f18c26daf7b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:24 +0200 Subject: [PATCH 368/505] New translations en-US.json (Gothic) --- src/config/locales/got-DE.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/got-DE.json b/src/config/locales/got-DE.json index 94de00b97f..f4216cfff3 100644 --- a/src/config/locales/got-DE.json +++ b/src/config/locales/got-DE.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 02c0c5867573e450e8da5aafdefec872ac989639 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:26 +0200 Subject: [PATCH 369/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 441309e0a4..54f1e396eb 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -361,7 +361,8 @@ "invalidImage": "Dis picture no get, look anoda one", "something_wrong": "Something don happen.", "something_wrong_alt": "You fit check https://ecency.com", - "something_wrong_reload": "Try am again" + "something_wrong_reload": "Try am again", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "You sure say you wan reblog am?", @@ -537,7 +538,15 @@ "more_replies": "dem replies wey remain" }, "search_result": { - "others": "Dem odas", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Una areas", "subscribe": "Enta", From c7a2032b0ced9c67fe7ce83fccd9237c2f6c1944 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:29 +0200 Subject: [PATCH 370/505] New translations en-US.json (Turkmen) --- src/config/locales/tk-TM.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/tk-TM.json b/src/config/locales/tk-TM.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/tk-TM.json +++ b/src/config/locales/tk-TM.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 98696334a73b1fb3d3432772721da493099a5872 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:31 +0200 Subject: [PATCH 371/505] New translations en-US.json (Assamese) --- src/config/locales/as-IN.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/as-IN.json b/src/config/locales/as-IN.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/as-IN.json +++ b/src/config/locales/as-IN.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 643fd6628578ddbdc74a458e37cb7b45ec564b68 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:32 +0200 Subject: [PATCH 372/505] New translations en-US.json (Kashmiri) --- src/config/locales/ks-IN.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ks-IN.json b/src/config/locales/ks-IN.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/ks-IN.json +++ b/src/config/locales/ks-IN.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From e1c8df19230720860b3b4e537e433cdfb4ad9d11 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:34 +0200 Subject: [PATCH 373/505] New translations en-US.json (Cebuano) --- src/config/locales/ceb-PH.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ceb-PH.json b/src/config/locales/ceb-PH.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/ceb-PH.json +++ b/src/config/locales/ceb-PH.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From ee61c060211a7015b630f8d4f1cac4008117517b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:35 +0200 Subject: [PATCH 374/505] New translations en-US.json (Yoruba) --- src/config/locales/yo-NG.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/yo-NG.json b/src/config/locales/yo-NG.json index 83f339ed83..9e5c4bc92e 100644 --- a/src/config/locales/yo-NG.json +++ b/src/config/locales/yo-NG.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 86ec1fde69f1eeadc9086b21ff24dc63cc639ae1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:38 +0200 Subject: [PATCH 375/505] New translations en-US.json (Tajik) --- src/config/locales/tg-TJ.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/tg-TJ.json b/src/config/locales/tg-TJ.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/tg-TJ.json +++ b/src/config/locales/tg-TJ.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 0e608956ee1a2e0b8532b43cd688f16613ad40dc Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:40 +0200 Subject: [PATCH 376/505] New translations en-US.json (Nepali) --- src/config/locales/ne-NP.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ne-NP.json b/src/config/locales/ne-NP.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/ne-NP.json +++ b/src/config/locales/ne-NP.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From eb547833fc1de3d53330be8be29652b609be6f8d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:40 +0200 Subject: [PATCH 377/505] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index 3d49dbe44e..d68df41112 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -361,7 +361,8 @@ "invalidImage": "Neispravna slika, isprobajte drugu datoteku", "something_wrong": "Došlo je do greške.", "something_wrong_alt": "Pokušajte https://ecency.com", - "something_wrong_reload": "Ponovo napuni" + "something_wrong_reload": "Ponovo napuni", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Da li ste sigurni da želite da podelite?", @@ -537,7 +538,15 @@ "more_replies": "još odgovora" }, "search_result": { - "others": "Ostalo", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Zajednice", "subscribe": "Pridruži se", From 1bee00efe981f5124dbe54c0975b572114fb67fb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:43 +0200 Subject: [PATCH 378/505] New translations en-US.json (Swahili) --- src/config/locales/sw-KE.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/sw-KE.json b/src/config/locales/sw-KE.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/sw-KE.json +++ b/src/config/locales/sw-KE.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 9d987ea98b40f49a59d0926e6533833193cdbc8f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:45 +0200 Subject: [PATCH 379/505] New translations en-US.json (Vietnamese) --- src/config/locales/vi-VN.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/vi-VN.json b/src/config/locales/vi-VN.json index 05abcd73d3..4acae6f634 100644 --- a/src/config/locales/vi-VN.json +++ b/src/config/locales/vi-VN.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 5b90f9c10a48368ef904a05dd66c422587ee6997 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:47 +0200 Subject: [PATCH 380/505] New translations en-US.json (Chinese Traditional) --- src/config/locales/zh-TW.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/zh-TW.json b/src/config/locales/zh-TW.json index 81e38a919a..6afe3b3f4e 100644 --- a/src/config/locales/zh-TW.json +++ b/src/config/locales/zh-TW.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "您確定想要轉發？", @@ -537,7 +538,15 @@ "more_replies": "更多回復" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From bf17666dd7d25e0a6a11a8b9fcca4289fc14ecff Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:49 +0200 Subject: [PATCH 381/505] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index d1969af319..d171a71dcc 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -361,7 +361,8 @@ "invalidImage": "अमान्य छवि, भिन्न फ़ाइल आज़माएं", "something_wrong": "कुछ गलत हो गया।", "something_wrong_alt": "Https://ecency.com आज़माएं", - "something_wrong_reload": "पुनः लोड करें" + "something_wrong_reload": "पुनः लोड करें", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "क्या आप निश्चित हैं, आप इसे हटाना चाहते हैं?", @@ -537,7 +538,15 @@ "more_replies": "अधिक जवाब" }, "search_result": { - "others": "अन्य", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "समुदाय", "subscribe": "शामिल हों", From 0908590a86e96727e750d7ac1fa9665fe7deb7db Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:51 +0200 Subject: [PATCH 382/505] New translations en-US.json (German) --- src/config/locales/de-DE.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index 633297b659..d2d9eeaba2 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -361,7 +361,8 @@ "invalidImage": "Ungültiges Bild, versuchen Sie eine andere Datei", "something_wrong": "Etwas ist schief gelaufen.", "something_wrong_alt": "Probiere https://ecency.com", - "something_wrong_reload": "Aktualisieren" + "something_wrong_reload": "Aktualisieren", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Möchtest du diesen Beitrag wirklich teilen?", @@ -537,7 +538,15 @@ "more_replies": "weitere Antworten" }, "search_result": { - "others": "Andere", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Beitreten", From 6035ac88ae9b7a0230df6f8c1fe11c6fb877c26e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:53 +0200 Subject: [PATCH 383/505] New translations en-US.json (Armenian) --- src/config/locales/hy-AM.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/hy-AM.json b/src/config/locales/hy-AM.json index b9333f90e8..6a6774d637 100644 --- a/src/config/locales/hy-AM.json +++ b/src/config/locales/hy-AM.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From c19caae5868cfc1423c2a063e4c8c8cc3ef6b0a3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:55 +0200 Subject: [PATCH 384/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index ac50099590..57e39f2162 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -361,7 +361,8 @@ "invalidImage": "Érvénytelen kép, próbálj egy másik fájlt", "something_wrong": "Valami hiba történt.", "something_wrong_alt": "Próbáld ezt https://ecency.com", - "something_wrong_reload": "Frissítsd" + "something_wrong_reload": "Frissítsd", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Biztos, hogy megosztod?", @@ -537,7 +538,15 @@ "more_replies": "további hozzászólások betöltése" }, "search_result": { - "others": "Egyéb", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Közösségek", "subscribe": "Csatlakozz", From c3d3289c7b8fafaf7210c766c63cc0b2003e6a30 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:56 +0200 Subject: [PATCH 385/505] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index d6671c0635..44b299ddcb 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From f7669922cb0c564fbfd627ad09e256b55d7783f5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:57:58 +0200 Subject: [PATCH 386/505] New translations en-US.json (Irish) --- src/config/locales/ga-IE.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ga-IE.json b/src/config/locales/ga-IE.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/ga-IE.json +++ b/src/config/locales/ga-IE.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 0e82b8cd24365ce5244bdbbf907d13606e36216b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:00 +0200 Subject: [PATCH 387/505] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index 692b71db98..b11949f393 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -361,7 +361,8 @@ "invalidImage": "Vääränlainen kuva, yritä toista", "something_wrong": "Jokin meni pieleen.", "something_wrong_alt": "Kokeile https://ecency.com", - "something_wrong_reload": "Päivitä" + "something_wrong_reload": "Päivitä", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Haluatko varmasti jakaa?", @@ -537,7 +538,15 @@ "more_replies": "lisää vastauksia" }, "search_result": { - "others": "Muut", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Yhteisöt", "subscribe": "Liity", From 58791b56e30d417f3d3b63a4b35b9bcbea4109ea Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:02 +0200 Subject: [PATCH 388/505] New translations en-US.json (Greek) --- src/config/locales/el-GR.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/el-GR.json b/src/config/locales/el-GR.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/el-GR.json +++ b/src/config/locales/el-GR.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 5f801168188ef959e8cb0573b0518cddb4cb2c28 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:04 +0200 Subject: [PATCH 389/505] New translations en-US.json (Danish) --- src/config/locales/da-DK.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/da-DK.json b/src/config/locales/da-DK.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/da-DK.json +++ b/src/config/locales/da-DK.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 496044f01f347c91f7e10e9674457930f5ac8518 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:06 +0200 Subject: [PATCH 390/505] New translations en-US.json (Japanese) --- src/config/locales/ja-JP.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ja-JP.json b/src/config/locales/ja-JP.json index 7df99fa3c4..59207d4b56 100644 --- a/src/config/locales/ja-JP.json +++ b/src/config/locales/ja-JP.json @@ -361,7 +361,8 @@ "invalidImage": "無効な画像です、違うファイルを試してください", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "本当にリブログしますか？", @@ -537,7 +538,15 @@ "more_replies": "返信をもっと表示" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 578b340948604cb6c810aab91118b5e3437b05a6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:08 +0200 Subject: [PATCH 391/505] New translations en-US.json (Czech) --- src/config/locales/cs-CZ.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/cs-CZ.json b/src/config/locales/cs-CZ.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/cs-CZ.json +++ b/src/config/locales/cs-CZ.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 03417623908c79632136c0c9bcf8c6249b5f15f4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:10 +0200 Subject: [PATCH 392/505] New translations en-US.json (Catalan) --- src/config/locales/ca-ES.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ca-ES.json b/src/config/locales/ca-ES.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/ca-ES.json +++ b/src/config/locales/ca-ES.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 3c7a29835119464c4fe1ca4fcd46a02a9b23749d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:12 +0200 Subject: [PATCH 393/505] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 2d52c42cc5..61065e5ff0 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -361,7 +361,8 @@ "invalidImage": "Невалидна снимка,опитайте различен файл", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Сигорни ли сте,че искате да споделите?", @@ -537,7 +538,15 @@ "more_replies": "още отговори" }, "search_result": { - "others": "Други", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Общности", "subscribe": "Join", From 9ca8af7b12c7b4362ca14b8f7316a6d4706bd043 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:14 +0200 Subject: [PATCH 394/505] New translations en-US.json (Arabic) --- src/config/locales/ar-SA.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json index 0c9b4600e2..dbd7804ad4 100644 --- a/src/config/locales/ar-SA.json +++ b/src/config/locales/ar-SA.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 18438593d4ebc7fc04bcf184d8182aaa55ff519e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:15 +0200 Subject: [PATCH 395/505] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index 81da74ff85..f9a68cb846 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -361,7 +361,8 @@ "invalidImage": "Imagen no válida, prueba un archivo diferente", "something_wrong": "Algo ha fallado.", "something_wrong_alt": "Prueba https://ecency.com", - "something_wrong_reload": "Recarga" + "something_wrong_reload": "Recarga", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "¿Estás seguro de querer rebloguear?", @@ -537,7 +538,15 @@ "more_replies": "mas comentarios" }, "search_result": { - "others": "Otros", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Comunidades", "subscribe": "Unirse", From 93f52a6ec2926067ead07a07c351b22b2bd2ef2d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:17 +0200 Subject: [PATCH 396/505] New translations en-US.json (Romanian) --- src/config/locales/ro-RO.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ro-RO.json b/src/config/locales/ro-RO.json index 5fc79b811c..29cae06d49 100644 --- a/src/config/locales/ro-RO.json +++ b/src/config/locales/ro-RO.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Ești sigur că vrei să redistribui?", @@ -537,7 +538,15 @@ "more_replies": "vezi mai multe răspunsuri" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 839708c30a977faae45d9a86497957737f15d988 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:19 +0200 Subject: [PATCH 397/505] New translations en-US.json (French) --- src/config/locales/fr-FR.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/fr-FR.json b/src/config/locales/fr-FR.json index 1b7e4e990c..31f6ddd62f 100644 --- a/src/config/locales/fr-FR.json +++ b/src/config/locales/fr-FR.json @@ -361,7 +361,8 @@ "invalidImage": "Image invalide, essayez un autre fichier", "something_wrong": "Une erreur s’est produite.", "something_wrong_alt": "Essayez https://ecency.com", - "something_wrong_reload": "Rafraîchir" + "something_wrong_reload": "Rafraîchir", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Êtes-vous sûr de vouloir rebloguer ?", @@ -537,7 +538,15 @@ "more_replies": "plus de réponses" }, "search_result": { - "others": "Autres", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communautés", "subscribe": "Join", From 4acc8dfb4ef8d78b27f07b5b5e968692c2fc447d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:21 +0200 Subject: [PATCH 398/505] New translations en-US.json (Italian) --- src/config/locales/it-IT.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/it-IT.json b/src/config/locales/it-IT.json index 2a533e90e3..995046f7ff 100644 --- a/src/config/locales/it-IT.json +++ b/src/config/locales/it-IT.json @@ -361,7 +361,8 @@ "invalidImage": "Immagine non valida, prova un file diverso", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Sei sicuro di voler condividere?", @@ -537,7 +538,15 @@ "more_replies": "altre risposte" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From dd51832aa10fb502af88705d1cb3555b24fafcd5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:23 +0200 Subject: [PATCH 399/505] New translations en-US.json (Georgian) --- src/config/locales/ka-GE.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ka-GE.json b/src/config/locales/ka-GE.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/ka-GE.json +++ b/src/config/locales/ka-GE.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 74dba027d3cf632d6e6b95890113aec66507b254 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:25 +0200 Subject: [PATCH 400/505] New translations en-US.json (Chinese Simplified) --- src/config/locales/zh-CN.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/zh-CN.json b/src/config/locales/zh-CN.json index 512cc1b04d..23d3682603 100644 --- a/src/config/locales/zh-CN.json +++ b/src/config/locales/zh-CN.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "您确定想要转发？", @@ -537,7 +538,15 @@ "more_replies": "更多回复" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 71a9ef7af6c81fc8e8451e20406814899837ca98 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:27 +0200 Subject: [PATCH 401/505] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index e9aa7734a4..8e51f391c9 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -361,7 +361,8 @@ "invalidImage": "Imagem inválida, tente um arquivo diferente", "something_wrong": "Algo correu mal.", "something_wrong_alt": "Tente em https://ecency.com", - "something_wrong_reload": "Recarregar" + "something_wrong_reload": "Recarregar", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Tem certeza de que deseja reblogar?", @@ -537,7 +538,15 @@ "more_replies": "mais respostas" }, "search_result": { - "others": "Outros", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Aderir", From d6454b9515d444b83be76c52e475587f1a83f415 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:28 +0200 Subject: [PATCH 402/505] New translations en-US.json (Ukrainian) --- src/config/locales/uk-UA.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/uk-UA.json b/src/config/locales/uk-UA.json index eddd29e458..e890fbf59f 100644 --- a/src/config/locales/uk-UA.json +++ b/src/config/locales/uk-UA.json @@ -361,7 +361,8 @@ "invalidImage": "Недійсне зображення, спробуйте інший файл", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Ви дійсно бажаєте зробити репост?", @@ -537,7 +538,15 @@ "more_replies": "більше відповідей" }, "search_result": { - "others": "Інше", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Спільноти", "subscribe": "Join", From 98c895f0570386984ecc323db7819766220d27dd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:30 +0200 Subject: [PATCH 403/505] New translations en-US.json (Turkish) --- src/config/locales/tr-TR.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/tr-TR.json b/src/config/locales/tr-TR.json index 3d99e8b0ec..4487b6f101 100644 --- a/src/config/locales/tr-TR.json +++ b/src/config/locales/tr-TR.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 7eaf5134145830a1ecdf065b7ad71c6e4c47ebc0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:32 +0200 Subject: [PATCH 404/505] New translations en-US.json (Swedish) --- src/config/locales/sv-SE.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/sv-SE.json b/src/config/locales/sv-SE.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/sv-SE.json +++ b/src/config/locales/sv-SE.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From b287dd017e541a060678232cbf07c86c7b5a6d8e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:34 +0200 Subject: [PATCH 405/505] New translations en-US.json (Albanian) --- src/config/locales/sq-AL.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/sq-AL.json b/src/config/locales/sq-AL.json index b9333f90e8..6a6774d637 100644 --- a/src/config/locales/sq-AL.json +++ b/src/config/locales/sq-AL.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 5b162f0ef77d15855e3d02962d783554f4d9f936 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:36 +0200 Subject: [PATCH 406/505] New translations en-US.json (Slovenian) --- src/config/locales/sl-SI.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/sl-SI.json b/src/config/locales/sl-SI.json index 7d05185967..2f375dcd0a 100644 --- a/src/config/locales/sl-SI.json +++ b/src/config/locales/sl-SI.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From aa74bfa02667e8dc9c492ce7fea174326d19697c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:38 +0200 Subject: [PATCH 407/505] New translations en-US.json (Slovak) --- src/config/locales/sk-SK.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/sk-SK.json b/src/config/locales/sk-SK.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/sk-SK.json +++ b/src/config/locales/sk-SK.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From c18871077a80f2230636e3b06f90c869a9596b09 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:39 +0200 Subject: [PATCH 408/505] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index 9a15ca174c..1ceb563ca0 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -361,7 +361,8 @@ "invalidImage": "Изображение не подходит, попробуйте другой файл", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Вы уверены, что хотите сделать репост?", @@ -537,7 +538,15 @@ "more_replies": "больше ответов" }, "search_result": { - "others": "Другое", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Сообщества", "subscribe": "Join", From f804caf016f2ff069c408787c07d35d668e16d69 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:41 +0200 Subject: [PATCH 409/505] New translations en-US.json (Polish) --- src/config/locales/pl-PL.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/pl-PL.json b/src/config/locales/pl-PL.json index d76937a720..495d40cb98 100644 --- a/src/config/locales/pl-PL.json +++ b/src/config/locales/pl-PL.json @@ -361,7 +361,8 @@ "invalidImage": "Nieprawidłowy obraz, spróbuj innego pliku", "something_wrong": "Coś poszło nie tak.", "something_wrong_alt": "Wypróbuj https://ecency.com", - "something_wrong_reload": "Przeładowanie" + "something_wrong_reload": "Przeładowanie", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Jesteś pewien, że chcesz reblogować?", @@ -537,7 +538,15 @@ "more_replies": "więcej odpowiedzi" }, "search_result": { - "others": "Inne", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Społeczność", "subscribe": "Przyłącz się", From f390174c34a96d64fb869e6db87e42dd60c6bbe5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:43 +0200 Subject: [PATCH 410/505] New translations en-US.json (Korean) --- src/config/locales/ko-KR.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ko-KR.json b/src/config/locales/ko-KR.json index f6e8ad657e..2d7d963e04 100644 --- a/src/config/locales/ko-KR.json +++ b/src/config/locales/ko-KR.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "리블로그 하시겠습니까?", @@ -537,7 +538,15 @@ "more_replies": "개의 대댓글" }, "search_result": { - "others": "기타", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "커뮤니티", "subscribe": "Join", From e0b1495a8ebe319941fe5111da81a6787cac963f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:45 +0200 Subject: [PATCH 411/505] New translations en-US.json (Punjabi) --- src/config/locales/pa-IN.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/pa-IN.json b/src/config/locales/pa-IN.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/pa-IN.json +++ b/src/config/locales/pa-IN.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From fd554a8eed1d454428c90ac53f3b322e506ad711 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:47 +0200 Subject: [PATCH 412/505] New translations en-US.json (Norwegian) --- src/config/locales/no-NO.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/no-NO.json b/src/config/locales/no-NO.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/no-NO.json +++ b/src/config/locales/no-NO.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 302edde68a745eaf5b4f62a4fbb6d330128bdb63 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:48 +0200 Subject: [PATCH 413/505] New translations en-US.json (Dutch) --- src/config/locales/nl-NL.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/nl-NL.json b/src/config/locales/nl-NL.json index 8afd9da365..ca77c4a494 100644 --- a/src/config/locales/nl-NL.json +++ b/src/config/locales/nl-NL.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 7f2a5c3abb29d514d5ee54ec768dcb13130d98d5 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:50 +0200 Subject: [PATCH 414/505] New translations en-US.json (Mongolian) --- src/config/locales/mn-MN.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/mn-MN.json b/src/config/locales/mn-MN.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/mn-MN.json +++ b/src/config/locales/mn-MN.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 0542116d7ec1d5215566398a5aa0510d8c44a20f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:52 +0200 Subject: [PATCH 415/505] New translations en-US.json (Macedonian) --- src/config/locales/mk-MK.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/mk-MK.json b/src/config/locales/mk-MK.json index c4717a8059..e1651e8d7b 100644 --- a/src/config/locales/mk-MK.json +++ b/src/config/locales/mk-MK.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 1d057e1fe9dcfd72c905b0d9850a5966f7683c66 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:54 +0200 Subject: [PATCH 416/505] New translations en-US.json (Lithuanian) --- src/config/locales/lt-LT.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/lt-LT.json b/src/config/locales/lt-LT.json index 8cafec5bf2..fb55e0ea7b 100644 --- a/src/config/locales/lt-LT.json +++ b/src/config/locales/lt-LT.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 5792980b753f498d8a9f8c3231659e5cbd38eb9b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:56 +0200 Subject: [PATCH 417/505] New translations en-US.json (Kurdish) --- src/config/locales/ku-TR.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/ku-TR.json b/src/config/locales/ku-TR.json index fd84f8996d..b86c0ffbf4 100644 --- a/src/config/locales/ku-TR.json +++ b/src/config/locales/ku-TR.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Bi rastî jî tu dixwazî dîsa biweşînî?", @@ -537,7 +538,15 @@ "more_replies": "bersivên zêdetir" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 8b3275839c6c6f78ecf3a8ec828758236497a8a0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Wed, 6 Jan 2021 23:58:58 +0200 Subject: [PATCH 418/505] New translations en-US.json (Spanish, Mexico) --- src/config/locales/es-MX.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/es-MX.json b/src/config/locales/es-MX.json index 4dcc2e1a41..a101ec578c 100644 --- a/src/config/locales/es-MX.json +++ b/src/config/locales/es-MX.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 271e7c672dfb883a187ee03b02ef011320f63020 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 00:07:15 +0200 Subject: [PATCH 419/505] Update source file en-US.json --- src/config/locales/en-US.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index 4dcc2e1a41..a101ec578c 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -361,7 +361,8 @@ "invalidImage": "Invalid image, try different file", "something_wrong": "Something went wrong.", "something_wrong_alt": "Try https://ecency.com", - "something_wrong_reload": "Reload" + "something_wrong_reload": "Reload", + "can_not_be_empty": "Title and body can not be empty!" }, "post": { "reblog_alert": "Are you sure, you want to reblog?", @@ -537,7 +538,15 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", + "best": { + "title": "Best" + }, + "people": { + "title": "People" + }, + "topics": { + "title": "Topics" + }, "communities": { "title": "Communities", "subscribe": "Join", From 24d0e46b2c3c15417366038461580fad36ac21a2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 05:46:31 +0200 Subject: [PATCH 420/505] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index d171a71dcc..bc53099212 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -362,7 +362,7 @@ "something_wrong": "कुछ गलत हो गया।", "something_wrong_alt": "Https://ecency.com आज़माएं", "something_wrong_reload": "पुनः लोड करें", - "can_not_be_empty": "Title and body can not be empty!" + "can_not_be_empty": "शीर्षक और शरीर खाली नहीं हो सकता!" }, "post": { "reblog_alert": "क्या आप निश्चित हैं, आप इसे हटाना चाहते हैं?", @@ -539,13 +539,13 @@ }, "search_result": { "best": { - "title": "Best" + "title": "सर्वश्रेष्ठ" }, "people": { - "title": "People" + "title": "लोग" }, "topics": { - "title": "Topics" + "title": "विषयों" }, "communities": { "title": "समुदाय", From 3d5d85edcc58c69843579d607d8d6e8a0810e126 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 08:07:26 +0200 Subject: [PATCH 421/505] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index f9a68cb846..cacf499a69 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -362,7 +362,7 @@ "something_wrong": "Algo ha fallado.", "something_wrong_alt": "Prueba https://ecency.com", "something_wrong_reload": "Recarga", - "can_not_be_empty": "Title and body can not be empty!" + "can_not_be_empty": "Título y cuerpo no pueden estar vacíos!" }, "post": { "reblog_alert": "¿Estás seguro de querer rebloguear?", @@ -539,13 +539,13 @@ }, "search_result": { "best": { - "title": "Best" + "title": "Mejor" }, "people": { - "title": "People" + "title": "Personas" }, "topics": { - "title": "Topics" + "title": "Temas" }, "communities": { "title": "Comunidades", From 7c9071d7a96de1e320801b433c2f2325ae9dad21 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 09:47:13 +0200 Subject: [PATCH 422/505] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index b11949f393..d2552ddaa3 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -362,7 +362,7 @@ "something_wrong": "Jokin meni pieleen.", "something_wrong_alt": "Kokeile https://ecency.com", "something_wrong_reload": "Päivitä", - "can_not_be_empty": "Title and body can not be empty!" + "can_not_be_empty": "Otsikko ja sisältö eivät voi olla tyhjiä!" }, "post": { "reblog_alert": "Haluatko varmasti jakaa?", @@ -539,13 +539,13 @@ }, "search_result": { "best": { - "title": "Best" + "title": "Parhaat" }, "people": { - "title": "People" + "title": "Ihmiset" }, "topics": { - "title": "Topics" + "title": "Aiheet" }, "communities": { "title": "Yhteisöt", From e1bea5bf5cdd72fcad28afc86b480a74bd5a7bac Mon Sep 17 00:00:00 2001 From: feruzm Date: Thu, 7 Jan 2021 11:14:22 +0200 Subject: [PATCH 423/505] revert search changes --- src/config/locales/en-US.json | 1 + src/providers/hive/dhive.js | 7 +- .../container/communitiesContainer.js | 2 +- .../container/otherResultContainer.js | 4 +- .../searchResult/screen/searchResultScreen.js | 26 ++-- .../searchResult/screen/searchResultStyles.js | 3 - .../screen/tabs/best/postResult.js | 115 ------------------ .../screen/tabs/best/postResultStyles.js | 44 ------- .../tabs/communities/CommunitiesListItem.js | 80 ------------ .../screen/tabs/communities/communities.js | 108 ---------------- .../tabs/communities/communitiesList.js | 70 ----------- .../communities/communitiesListItemStyles.js | 62 ---------- .../tabs/communities/communitiesListStyles.js | 16 --- .../screen/tabs/topics/otherResults.js | 100 --------------- .../screen/tabs/topics/otherResultsStyles.js | 48 -------- 15 files changed, 16 insertions(+), 670 deletions(-) delete mode 100644 src/screens/searchResult/screen/tabs/best/postResult.js delete mode 100644 src/screens/searchResult/screen/tabs/best/postResultStyles.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communities.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesList.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js delete mode 100644 src/screens/searchResult/screen/tabs/topics/otherResults.js delete mode 100644 src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index a101ec578c..fa301490e7 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index db7ceea2a1..45914f0683 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -1130,7 +1130,8 @@ export const lookupAccounts = async (username) => { return users; } catch (error) { console.log('lookup_accounts'); - throw error; + return []; + //throw error; } }; @@ -1139,8 +1140,8 @@ export const getTrendingTags = async (tag) => { const tags = await client.database.call('get_trending_tags', [tag, 20]); return tags; } catch (error) { - console.log('get_trending_tags'); - throw error; + return []; + //throw error; } }; diff --git a/src/screens/searchResult/container/communitiesContainer.js b/src/screens/searchResult/container/communitiesContainer.js index bfbd4d9523..fee6658124 100644 --- a/src/screens/searchResult/container/communitiesContainer.js +++ b/src/screens/searchResult/container/communitiesContainer.js @@ -6,9 +6,9 @@ import isEmpty from 'lodash/isEmpty'; import ROUTES from '../../../constants/routeNames'; import { + subscribeCommunity, getCommunities, getSubscriptions, - subscribeCommunity, } from '../../../providers/hive/dhive'; const CommunitiesContainer = ({ diff --git a/src/screens/searchResult/container/otherResultContainer.js b/src/screens/searchResult/container/otherResultContainer.js index 3c62bdff76..9ee3cbd6c8 100644 --- a/src/screens/searchResult/container/otherResultContainer.js +++ b/src/screens/searchResult/container/otherResultContainer.js @@ -20,10 +20,10 @@ const OtherResultContainer = (props) => { setTags([]); if (searchValue) { - lookupAccounts(searchValue).then((res) => { + lookupAccounts(searchValue.replace(/\s+/g, '')).then((res) => { setUsers(res); }); - getTrendingTags(searchValue).then((res) => { + getTrendingTags(searchValue.replace(/\s+/g, '')).then((res) => { setTags(res); }); } else { diff --git a/src/screens/searchResult/screen/searchResultScreen.js b/src/screens/searchResult/screen/searchResultScreen.js index 99f28f3216..d174bfbca8 100644 --- a/src/screens/searchResult/screen/searchResultScreen.js +++ b/src/screens/searchResult/screen/searchResultScreen.js @@ -5,9 +5,9 @@ import { useIntl } from 'react-intl'; // Components import { SearchInput, TabBar } from '../../../components'; -import Communities from './tabs/communities/communities'; -import PostResult from './tabs/best/postResult'; -import OtherResult from './tabs/topics/otherResults'; +import Communities from './communities'; +import PostResult from './postResult'; +import OtherResult from './otherResults'; // Styles import styles from './searchResultStyles'; @@ -36,7 +36,6 @@ const SearchResultScreen = ({ navigation }) => { tabUnderlineDefaultWidth={80} tabUnderlineScaleX={2} tabBarPosition="overlayTop" - textStyle={styles.tabBarText} /> ); @@ -55,29 +54,20 @@ const SearchResultScreen = ({ navigation }) => { prerenderingSiblingsNumber={Infinity} > - + - - + + - - - ); diff --git a/src/screens/searchResult/screen/searchResultStyles.js b/src/screens/searchResult/screen/searchResultStyles.js index 2c4a24638a..0ef7bc05b2 100644 --- a/src/screens/searchResult/screen/searchResultStyles.js +++ b/src/screens/searchResult/screen/searchResultStyles.js @@ -28,7 +28,4 @@ export default EStyleSheet.create({ tabs: { flex: 1, }, - tabBarText: { - fontSize: 14, - }, }); diff --git a/src/screens/searchResult/screen/tabs/best/postResult.js b/src/screens/searchResult/screen/tabs/best/postResult.js deleted file mode 100644 index d49a3fd424..0000000000 --- a/src/screens/searchResult/screen/tabs/best/postResult.js +++ /dev/null @@ -1,115 +0,0 @@ -import React from 'react'; -import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; -import get from 'lodash/get'; -import isUndefined from 'lodash/isUndefined'; -import FastImage from 'react-native-fast-image'; -import { useIntl } from 'react-intl'; - -// Components -import { PostHeaderDescription, FilterBar } from '../../../../../components'; -import { TextWithIcon, CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; -import PostResultContainer from '../../../container/postResultContainer'; - -import { getTimeFromNow } from '../../../../../utils/time'; - -import styles from './postResultStyles'; - -import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; - -const filterOptions = ['relevance', 'popularity', 'newest']; - -const PostResult = ({ navigation, searchValue }) => { - const intl = useIntl(); - - const _renderItem = (item, index) => { - return ( - - - - - {item.title} - {!!item.body && ( - - {item.body} - - )} - - - {!isUndefined(item.payout) && ( - {`$ ${item.payout}`} - )} - - - - - ); - }; - - const _renderEmptyContent = () => { - return ( - <> - - - - - - - - - ); - }; - - return ( - - {({ data, filterIndex, handleFilterChanged, handleOnPress, loadMore }) => ( - - - intl.formatMessage({ - id: `search_result.post_result_filter.${item}`, - }), - )} - defaultText={intl.formatMessage({ - id: `search_result.post_result_filter.${filterOptions[filterIndex]}`, - })} - selectedOptionIndex={filterIndex} - onDropdownSelect={(index) => handleFilterChanged(index, filterOptions[index])} - /> - item.id && item.id.toString()} - renderItem={({ item, index }) => ( - handleOnPress(item)}> - {_renderItem(item, index)} - - )} - onEndReached={loadMore} - ListEmptyComponent={_renderEmptyContent} - ListFooterComponent={} - /> - - )} - - ); -}; - -export default PostResult; diff --git a/src/screens/searchResult/screen/tabs/best/postResultStyles.js b/src/screens/searchResult/screen/tabs/best/postResultStyles.js deleted file mode 100644 index db40ab8fec..0000000000 --- a/src/screens/searchResult/screen/tabs/best/postResultStyles.js +++ /dev/null @@ -1,44 +0,0 @@ -import EStyleSheet from 'react-native-extended-stylesheet'; - -export default EStyleSheet.create({ - container: { - flex: 1, - backgroundColor: '$primaryBackgroundColor', - }, - title: { - fontSize: 16, - fontWeight: 'bold', - marginVertical: 5, - color: '$primaryBlack', - }, - summary: { - fontSize: 13, - color: '$primaryDarkGray', - }, - itemWrapper: { - paddingHorizontal: 16, - paddingTop: 16, - paddingBottom: 8, - borderRadius: 8, - backgroundColor: '$primaryBackgroundColor', - }, - itemWrapperGray: { - backgroundColor: '$primaryLightBackground', - }, - stats: { - flexDirection: 'row', - }, - postIcon: { - alignSelf: 'flex-start', - fontSize: 20, - color: '$iconColor', - margin: 0, - width: 20, - marginLeft: 25, - }, - postIconText: { - color: '$primaryDarkGray', - fontSize: 13, - alignSelf: 'center', - }, -}); diff --git a/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js b/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js deleted file mode 100644 index 10de0c140e..0000000000 --- a/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js +++ /dev/null @@ -1,80 +0,0 @@ -import React, { useState } from 'react'; -import { View, Text, TouchableOpacity } from 'react-native'; -import { useIntl } from 'react-intl'; - -import styles from './communitiesListItemStyles'; - -import { Tag } from '../../../../../components/basicUIElements'; - -const UserListItem = ({ - index, - handleOnPress, - handleOnLongPress, - title, - about, - admins, - id, - authors, - posts, - subscribers, - isNsfw, - name, - handleSubscribeButtonPress, - isSubscribed, - isLoggedIn, -}) => { - const [subscribed, setSubscribed] = useState(isSubscribed); - const intl = useIntl(); - - const _handleSubscribeButtonPress = () => { - handleSubscribeButtonPress({ subscribed: !subscribed, communityId: name }).then(() => { - setSubscribed(!subscribed); - }); - }; - - return ( - handleOnLongPress && handleOnLongPress()} - onPress={() => handleOnPress && handleOnPress(name)} - > - - - - {title} - {isLoggedIn && ( - - )} - - {!!about && {about}} - - - {`${subscribers.toString()} ${intl.formatMessage({ - id: 'search_result.communities.subscribers', - })} • ${authors.toString()} ${intl.formatMessage({ - id: 'search_result.communities.posters', - })} • ${posts} ${intl.formatMessage({ - id: 'search_result.communities.posts', - })}`} - - - - - ); -}; - -export default UserListItem; diff --git a/src/screens/searchResult/screen/tabs/communities/communities.js b/src/screens/searchResult/screen/tabs/communities/communities.js deleted file mode 100644 index d053585528..0000000000 --- a/src/screens/searchResult/screen/tabs/communities/communities.js +++ /dev/null @@ -1,108 +0,0 @@ -import React from 'react'; -import { useIntl } from 'react-intl'; -import { FlatList, View, Text, TouchableOpacity } from 'react-native'; -import get from 'lodash/get'; - -// Components -import { FilterBar, UserAvatar } from '../../../../../components'; -import CommunitiesList from './communitiesList'; -import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; - -import CommunitiesContainer from '../../../container/communitiesContainer'; -import styles from '../topics/otherResultsStyles'; -import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; -import Tag from '../../../../../components/basicUIElements/view/tag/tagView'; - -const filterOptions = ['my', 'rank', 'subs', 'new']; - -const CommunitiesScreen = ({ navigation, searchValue }) => { - const intl = useIntl(); - - const activeVotes = get(navigation, 'state.params.activeVotes'); - - const _renderEmptyContent = () => { - return ( - <> - - - - - ); - }; - - return ( - - {({ - data, - filterIndex, - allSubscriptions, - handleOnVotersDropdownSelect, - handleOnPress, - handleSubscribeButtonPress, - isLoggedIn, - noResult, - }) => ( - <> - - intl.formatMessage({ - id: `search_result.communities_filter.${item}`, - }), - )} - defaultText={intl.formatMessage({ - id: `search_result.communities_filter.${filterOptions[filterIndex]}`, - })} - selectedOptionIndex={filterIndex} - onDropdownSelect={(index) => handleOnVotersDropdownSelect(index, filterOptions[index])} - /> - {filterIndex !== 0 && ( - - )} - {filterIndex === 0 && allSubscriptions && allSubscriptions.length > 0 && ( - `${item}-${ind}`} - renderItem={({ item, index }) => ( - - - handleOnPress(item[0])}> - - - handleOnPress(item[0])}> - {item[1]} - - - - - handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) - } - /> - - - )} - ListEmptyComponent={_renderEmptyContent} - /> - )} - - )} - - ); -}; - -export default CommunitiesScreen; diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesList.js b/src/screens/searchResult/screen/tabs/communities/communitiesList.js deleted file mode 100644 index da58020abc..0000000000 --- a/src/screens/searchResult/screen/tabs/communities/communitiesList.js +++ /dev/null @@ -1,70 +0,0 @@ -import React from 'react'; -import { SafeAreaView, FlatList } from 'react-native'; - -// Components -import { CommunityListItem } from '../../../../../components/basicUIElements'; -import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; - -// Styles -import styles from './communitiesListStyles'; - -const CommunitiesList = ({ - votes, - handleOnPress, - handleSubscribeButtonPress, - allSubscriptions, - isLoggedIn, - noResult, -}) => { - const _renderItem = ({ item, index }) => { - const isSubscribed = allSubscriptions.some((sub) => sub[0] === item.name); - - return ( - - ); - }; - - const _renderEmptyContent = () => { - return ( - <> - - - - - - - - - ); - }; - - return ( - - {!noResult && ( - item.id && item.id.toString()} - renderItem={_renderItem} - ListEmptyComponent={_renderEmptyContent} - /> - )} - - ); -}; - -export default CommunitiesList; diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js b/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js deleted file mode 100644 index 19880705c4..0000000000 --- a/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js +++ /dev/null @@ -1,62 +0,0 @@ -import EStyleSheet from 'react-native-extended-stylesheet'; - -export default EStyleSheet.create({ - container: { - padding: 8, - flexDirection: 'row', - }, - content: { - flexDirection: 'column', - marginLeft: 8, - width: '100%', - }, - itemWrapper: { - alignItems: 'center', - padding: 16, - borderRadius: 8, - flexDirection: 'row', - backgroundColor: '$primaryBackgroundColor', - }, - itemWrapperGray: { - backgroundColor: '$primaryLightBackground', - }, - title: { - color: '$primaryBlue', - fontSize: 17, - fontWeight: 'bold', - fontFamily: '$primaryFont', - }, - about: { - fontSize: 14, - fontFamily: '$primaryFont', - marginTop: 5, - paddingTop: 10, - color: '$primaryBlack', - }, - separator: { - width: 100, - alignSelf: 'center', - backgroundColor: '$primaryDarkGray', - height: 1, - marginVertical: 10, - }, - stats: { - fontSize: 14, - fontFamily: '$primaryFont', - color: '$primaryDarkGray', - paddingBottom: 10, - }, - subscribeButton: { - borderWidth: 1, - maxWidth: 75, - borderColor: '$primaryBlue', - }, - subscribeButtonText: { - textAlign: 'center', - color: '$primaryBlue', - }, - header: { - flexDirection: 'row', - justifyContent: 'space-between', - }, -}); diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js b/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js deleted file mode 100644 index 8423a2e5e1..0000000000 --- a/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js +++ /dev/null @@ -1,16 +0,0 @@ -import EStyleSheet from 'react-native-extended-stylesheet'; - -export default EStyleSheet.create({ - container: { - flex: 1, - padding: 8, - marginBottom: 40, - flexDirection: 'row', - backgroundColor: '$primaryBackgroundColor', - }, - text: { - color: '$iconColor', - fontSize: 12, - fontFamily: '$primaryFont', - }, -}); diff --git a/src/screens/searchResult/screen/tabs/topics/otherResults.js b/src/screens/searchResult/screen/tabs/topics/otherResults.js deleted file mode 100644 index aa3c948f0b..0000000000 --- a/src/screens/searchResult/screen/tabs/topics/otherResults.js +++ /dev/null @@ -1,100 +0,0 @@ -import React from 'react'; -import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; -import { useIntl } from 'react-intl'; - -// Components -import { FilterBar, UserAvatar } from '../../../../../components'; -import { CommunitiesPlaceHolder, UserListItem } from '../../../../../components/basicUIElements'; -import OtherResultContainer from '../../../container/otherResultContainer'; - -import styles from './otherResultsStyles'; - -const filterOptions = ['user', 'tag']; - -const OtherResult = ({ navigation, searchValue }) => { - const intl = useIntl(); - - const _renderTagItem = (item, index) => ( - - {`#${item.name}`} - - ); - - const _renderEmptyContent = () => { - return ( - <> - - - - - - - - - ); - }; - - const _renderList = (users, tags, filterIndex, handleOnPress) => { - switch (filterIndex) { - case 0: - if (users && users.length > 0) { - return ( - `${item}-${ind}`} - renderItem={({ item, index }) => ( - handleOnPress(item)} - index={index} - username={item} - /> - )} - ListEmptyComponent={_renderEmptyContent} - /> - ); - } - case 1: - if (tags && tags.length > 0) { - return ( - item.id} - renderItem={({ item, index }) => ( - handleOnPress(item)}> - {_renderTagItem(item, index)} - - )} - ListEmptyComponent={_renderEmptyContent} - /> - ); - } - default: - break; - } - }; - - return ( - - {({ users, tags, filterIndex, handleFilterChanged, handleOnPress, loadMore }) => ( - - - intl.formatMessage({ - id: `search_result.other_result_filter.${item}`, - }), - )} - defaultText={intl.formatMessage({ - id: `search_result.other_result_filter.${filterOptions[filterIndex]}`, - })} - selectedOptionIndex={filterIndex} - onDropdownSelect={(index) => handleFilterChanged(index, filterOptions[index])} - /> - {_renderList(users, tags, filterIndex, handleOnPress)} - - )} - - ); -}; - -export default OtherResult; diff --git a/src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js b/src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js deleted file mode 100644 index 6fe3db6757..0000000000 --- a/src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js +++ /dev/null @@ -1,48 +0,0 @@ -import EStyleSheet from 'react-native-extended-stylesheet'; - -export default EStyleSheet.create({ - container: { - flex: 1, - backgroundColor: '$primaryBackgroundColor', - }, - itemWrapper: { - paddingHorizontal: 16, - paddingTop: 16, - paddingBottom: 8, - borderRadius: 8, - backgroundColor: '$primaryBackgroundColor', - flexDirection: 'row', - alignItems: 'center', - }, - itemWrapperGray: { - backgroundColor: '$primaryLightBackground', - }, - username: { - marginLeft: 10, - color: '$primaryBlack', - }, - communityWrapper: { - paddingHorizontal: 16, - paddingTop: 10, - paddingBottom: 10, - borderRadius: 8, - backgroundColor: '$primaryBackgroundColor', - flexDirection: 'row', - alignItems: 'center', - flex: 1, - }, - subscribeButton: { - maxWidth: 75, - borderWidth: 1, - borderColor: '$primaryBlue', - }, - subscribeButtonText: { - textAlign: 'center', - color: '$primaryBlue', - }, - community: { - justifyContent: 'center', - marginLeft: 15, - color: '$primaryBlack', - }, -}); From 0246d9c35feb590293a5b936ac0feabef8435007 Mon Sep 17 00:00:00 2001 From: feruzm Date: Thu, 7 Jan 2021 11:18:51 +0200 Subject: [PATCH 424/505] add missing files --- .../screen/CommunitiesListItem.js | 80 ++++++++++++ .../searchResult/screen/communities.js | 108 ++++++++++++++++ .../searchResult/screen/communitiesList.js | 70 +++++++++++ .../screen/communitiesListItemStyles.js | 62 ++++++++++ .../screen/communitiesListStyles.js | 16 +++ .../searchResult/screen/otherResults.js | 107 ++++++++++++++++ .../searchResult/screen/otherResultsStyles.js | 48 ++++++++ src/screens/searchResult/screen/postResult.js | 115 ++++++++++++++++++ .../searchResult/screen/postResultStyles.js | 44 +++++++ 9 files changed, 650 insertions(+) create mode 100644 src/screens/searchResult/screen/CommunitiesListItem.js create mode 100644 src/screens/searchResult/screen/communities.js create mode 100644 src/screens/searchResult/screen/communitiesList.js create mode 100644 src/screens/searchResult/screen/communitiesListItemStyles.js create mode 100644 src/screens/searchResult/screen/communitiesListStyles.js create mode 100644 src/screens/searchResult/screen/otherResults.js create mode 100644 src/screens/searchResult/screen/otherResultsStyles.js create mode 100644 src/screens/searchResult/screen/postResult.js create mode 100644 src/screens/searchResult/screen/postResultStyles.js diff --git a/src/screens/searchResult/screen/CommunitiesListItem.js b/src/screens/searchResult/screen/CommunitiesListItem.js new file mode 100644 index 0000000000..0a70871c3b --- /dev/null +++ b/src/screens/searchResult/screen/CommunitiesListItem.js @@ -0,0 +1,80 @@ +import React, { useState } from 'react'; +import { View, Text, TouchableOpacity } from 'react-native'; +import { useIntl } from 'react-intl'; + +import styles from './communitiesListItemStyles'; + +import { Tag } from '../../../components/basicUIElements'; + +const UserListItem = ({ + index, + handleOnPress, + handleOnLongPress, + title, + about, + admins, + id, + authors, + posts, + subscribers, + isNsfw, + name, + handleSubscribeButtonPress, + isSubscribed, + isLoggedIn, +}) => { + const [subscribed, setSubscribed] = useState(isSubscribed); + const intl = useIntl(); + + const _handleSubscribeButtonPress = () => { + handleSubscribeButtonPress({ subscribed: !subscribed, communityId: name }).then(() => { + setSubscribed(!subscribed); + }); + }; + + return ( + handleOnLongPress && handleOnLongPress()} + onPress={() => handleOnPress && handleOnPress(name)} + > + + + + {title} + {isLoggedIn && ( + + )} + + {!!about && {about}} + + + {`${subscribers.toString()} ${intl.formatMessage({ + id: 'search_result.communities.subscribers', + })} • ${authors.toString()} ${intl.formatMessage({ + id: 'search_result.communities.posters', + })} • ${posts} ${intl.formatMessage({ + id: 'search_result.communities.posts', + })}`} + + + + + ); +}; + +export default UserListItem; diff --git a/src/screens/searchResult/screen/communities.js b/src/screens/searchResult/screen/communities.js new file mode 100644 index 0000000000..b3a615e296 --- /dev/null +++ b/src/screens/searchResult/screen/communities.js @@ -0,0 +1,108 @@ +import React from 'react'; +import { useIntl } from 'react-intl'; +import { FlatList, View, Text, TouchableOpacity } from 'react-native'; +import get from 'lodash/get'; + +// Components +import { FilterBar, UserAvatar } from '../../../components'; +import CommunitiesList from './communitiesList'; +import { CommunitiesPlaceHolder } from '../../../components/basicUIElements'; + +import CommunitiesContainer from '../container/communitiesContainer'; +import styles from './otherResultsStyles'; +import DEFAULT_IMAGE from '../../../assets/no_image.png'; +import Tag from '../../../components/basicUIElements/view/tag/tagView'; + +const filterOptions = ['my', 'rank', 'subs', 'new']; + +const CommunitiesScreen = ({ navigation, searchValue }) => { + const intl = useIntl(); + + const activeVotes = get(navigation, 'state.params.activeVotes'); + + const _renderEmptyContent = () => { + return ( + <> + + + + + ); + }; + + return ( + + {({ + data, + filterIndex, + allSubscriptions, + handleOnVotersDropdownSelect, + handleOnPress, + handleSubscribeButtonPress, + isLoggedIn, + noResult, + }) => ( + <> + + intl.formatMessage({ + id: `search_result.communities_filter.${item}`, + }), + )} + defaultText={intl.formatMessage({ + id: `search_result.communities_filter.${filterOptions[filterIndex]}`, + })} + selectedOptionIndex={filterIndex} + onDropdownSelect={(index) => handleOnVotersDropdownSelect(index, filterOptions[index])} + /> + {filterIndex !== 0 && ( + + )} + {filterIndex === 0 && allSubscriptions && allSubscriptions.length > 0 && ( + `${item}-${ind}`} + renderItem={({ item, index }) => ( + + + handleOnPress(item[0])}> + + + handleOnPress(item[0])}> + {item[1]} + + + + + handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) + } + /> + + + )} + ListEmptyComponent={_renderEmptyContent} + /> + )} + + )} + + ); +}; + +export default CommunitiesScreen; diff --git a/src/screens/searchResult/screen/communitiesList.js b/src/screens/searchResult/screen/communitiesList.js new file mode 100644 index 0000000000..a581b768e2 --- /dev/null +++ b/src/screens/searchResult/screen/communitiesList.js @@ -0,0 +1,70 @@ +import React from 'react'; +import { SafeAreaView, FlatList } from 'react-native'; + +// Components +import CommunitiesListItem from './CommunitiesListItem'; +import { CommunitiesPlaceHolder } from '../../../components/basicUIElements'; + +// Styles +import styles from './communitiesListStyles'; + +const CommunitiesList = ({ + votes, + handleOnPress, + handleSubscribeButtonPress, + allSubscriptions, + isLoggedIn, + noResult, +}) => { + const _renderItem = ({ item, index }) => { + const isSubscribed = allSubscriptions.some((sub) => sub[0] === item.name); + + return ( + + ); + }; + + const _renderEmptyContent = () => { + return ( + <> + + + + + + + + + ); + }; + + return ( + + {!noResult && ( + item.id && item.id.toString()} + renderItem={_renderItem} + ListEmptyComponent={_renderEmptyContent} + /> + )} + + ); +}; + +export default CommunitiesList; diff --git a/src/screens/searchResult/screen/communitiesListItemStyles.js b/src/screens/searchResult/screen/communitiesListItemStyles.js new file mode 100644 index 0000000000..19880705c4 --- /dev/null +++ b/src/screens/searchResult/screen/communitiesListItemStyles.js @@ -0,0 +1,62 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + padding: 8, + flexDirection: 'row', + }, + content: { + flexDirection: 'column', + marginLeft: 8, + width: '100%', + }, + itemWrapper: { + alignItems: 'center', + padding: 16, + borderRadius: 8, + flexDirection: 'row', + backgroundColor: '$primaryBackgroundColor', + }, + itemWrapperGray: { + backgroundColor: '$primaryLightBackground', + }, + title: { + color: '$primaryBlue', + fontSize: 17, + fontWeight: 'bold', + fontFamily: '$primaryFont', + }, + about: { + fontSize: 14, + fontFamily: '$primaryFont', + marginTop: 5, + paddingTop: 10, + color: '$primaryBlack', + }, + separator: { + width: 100, + alignSelf: 'center', + backgroundColor: '$primaryDarkGray', + height: 1, + marginVertical: 10, + }, + stats: { + fontSize: 14, + fontFamily: '$primaryFont', + color: '$primaryDarkGray', + paddingBottom: 10, + }, + subscribeButton: { + borderWidth: 1, + maxWidth: 75, + borderColor: '$primaryBlue', + }, + subscribeButtonText: { + textAlign: 'center', + color: '$primaryBlue', + }, + header: { + flexDirection: 'row', + justifyContent: 'space-between', + }, +}); diff --git a/src/screens/searchResult/screen/communitiesListStyles.js b/src/screens/searchResult/screen/communitiesListStyles.js new file mode 100644 index 0000000000..8423a2e5e1 --- /dev/null +++ b/src/screens/searchResult/screen/communitiesListStyles.js @@ -0,0 +1,16 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + padding: 8, + marginBottom: 40, + flexDirection: 'row', + backgroundColor: '$primaryBackgroundColor', + }, + text: { + color: '$iconColor', + fontSize: 12, + fontFamily: '$primaryFont', + }, +}); diff --git a/src/screens/searchResult/screen/otherResults.js b/src/screens/searchResult/screen/otherResults.js new file mode 100644 index 0000000000..213b0410ab --- /dev/null +++ b/src/screens/searchResult/screen/otherResults.js @@ -0,0 +1,107 @@ +import React from 'react'; +import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; +import { useIntl } from 'react-intl'; + +// Components +import { FilterBar, UserAvatar } from '../../../components'; +import { CommunitiesPlaceHolder } from '../../../components/basicUIElements'; +import OtherResultContainer from '../container/otherResultContainer'; + +import styles from './otherResultsStyles'; + +import DEFAULT_IMAGE from '../../../assets/no_image.png'; + +const filterOptions = ['user', 'tag']; + +const OtherResult = ({ navigation, searchValue }) => { + const intl = useIntl(); + + const _renderUserItem = (item, index) => ( + + + {item} + + ); + + const _renderTagItem = (item, index) => ( + + {`#${item.name}`} + + ); + + const _renderEmptyContent = () => { + return ( + <> + + + + + + + + + ); + }; + + const _renderList = (users, tags, filterIndex, handleOnPress) => { + switch (filterIndex) { + case 0: + if (users && users.length > 0) { + return ( + `${item}-${ind}`} + renderItem={({ item, index }) => ( + handleOnPress(item)}> + {_renderUserItem(item, index)} + + )} + ListEmptyComponent={_renderEmptyContent} + /> + ); + } + case 1: + if (tags && tags.length > 0) { + return ( + `${item.name}+${item.id}+${item.comments}`} + renderItem={({ item, index }) => ( + handleOnPress(item)}> + {_renderTagItem(item, index)} + + )} + ListEmptyComponent={_renderEmptyContent} + /> + ); + } + default: + break; + } + }; + + return ( + + {({ users, tags, filterIndex, handleFilterChanged, handleOnPress, loadMore }) => ( + + + intl.formatMessage({ + id: `search_result.other_result_filter.${item}`, + }), + )} + defaultText={intl.formatMessage({ + id: `search_result.other_result_filter.${filterOptions[filterIndex]}`, + })} + selectedOptionIndex={filterIndex} + onDropdownSelect={(index) => handleFilterChanged(index, filterOptions[index])} + /> + {_renderList(users, tags, filterIndex, handleOnPress)} + + )} + + ); +}; + +export default OtherResult; diff --git a/src/screens/searchResult/screen/otherResultsStyles.js b/src/screens/searchResult/screen/otherResultsStyles.js new file mode 100644 index 0000000000..6fe3db6757 --- /dev/null +++ b/src/screens/searchResult/screen/otherResultsStyles.js @@ -0,0 +1,48 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + backgroundColor: '$primaryBackgroundColor', + }, + itemWrapper: { + paddingHorizontal: 16, + paddingTop: 16, + paddingBottom: 8, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + flexDirection: 'row', + alignItems: 'center', + }, + itemWrapperGray: { + backgroundColor: '$primaryLightBackground', + }, + username: { + marginLeft: 10, + color: '$primaryBlack', + }, + communityWrapper: { + paddingHorizontal: 16, + paddingTop: 10, + paddingBottom: 10, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + flexDirection: 'row', + alignItems: 'center', + flex: 1, + }, + subscribeButton: { + maxWidth: 75, + borderWidth: 1, + borderColor: '$primaryBlue', + }, + subscribeButtonText: { + textAlign: 'center', + color: '$primaryBlue', + }, + community: { + justifyContent: 'center', + marginLeft: 15, + color: '$primaryBlack', + }, +}); diff --git a/src/screens/searchResult/screen/postResult.js b/src/screens/searchResult/screen/postResult.js new file mode 100644 index 0000000000..83c5f67cd7 --- /dev/null +++ b/src/screens/searchResult/screen/postResult.js @@ -0,0 +1,115 @@ +import React from 'react'; +import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; +import get from 'lodash/get'; +import isUndefined from 'lodash/isUndefined'; +import FastImage from 'react-native-fast-image'; +import { useIntl } from 'react-intl'; + +// Components +import { PostHeaderDescription, FilterBar } from '../../../components'; +import { TextWithIcon, CommunitiesPlaceHolder } from '../../../components/basicUIElements'; +import PostResultContainer from '../container/postResultContainer'; + +import { getTimeFromNow } from '../../../utils/time'; + +import styles from './postResultStyles'; + +import DEFAULT_IMAGE from '../../../assets/no_image.png'; + +const filterOptions = ['relevance', 'popularity', 'newest']; + +const PostResult = ({ navigation, searchValue }) => { + const intl = useIntl(); + + const _renderItem = (item, index) => { + return ( + + + + + {item.title} + {!!item.body && ( + + {item.body} + + )} + + + {!isUndefined(item.payout) && ( + {`$ ${item.payout}`} + )} + + + + + ); + }; + + const _renderEmptyContent = () => { + return ( + <> + + + + + + + + + ); + }; + + return ( + + {({ data, filterIndex, handleFilterChanged, handleOnPress, loadMore }) => ( + + + intl.formatMessage({ + id: `search_result.post_result_filter.${item}`, + }), + )} + defaultText={intl.formatMessage({ + id: `search_result.post_result_filter.${filterOptions[filterIndex]}`, + })} + selectedOptionIndex={filterIndex} + onDropdownSelect={(index) => handleFilterChanged(index, filterOptions[index])} + /> + item.id && item.id.toString()} + renderItem={({ item, index }) => ( + handleOnPress(item)}> + {_renderItem(item, index)} + + )} + onEndReached={loadMore} + ListEmptyComponent={_renderEmptyContent} + ListFooterComponent={} + /> + + )} + + ); +}; + +export default PostResult; diff --git a/src/screens/searchResult/screen/postResultStyles.js b/src/screens/searchResult/screen/postResultStyles.js new file mode 100644 index 0000000000..db40ab8fec --- /dev/null +++ b/src/screens/searchResult/screen/postResultStyles.js @@ -0,0 +1,44 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + backgroundColor: '$primaryBackgroundColor', + }, + title: { + fontSize: 16, + fontWeight: 'bold', + marginVertical: 5, + color: '$primaryBlack', + }, + summary: { + fontSize: 13, + color: '$primaryDarkGray', + }, + itemWrapper: { + paddingHorizontal: 16, + paddingTop: 16, + paddingBottom: 8, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + }, + itemWrapperGray: { + backgroundColor: '$primaryLightBackground', + }, + stats: { + flexDirection: 'row', + }, + postIcon: { + alignSelf: 'flex-start', + fontSize: 20, + color: '$iconColor', + margin: 0, + width: 20, + marginLeft: 25, + }, + postIconText: { + color: '$primaryDarkGray', + fontSize: 13, + alignSelf: 'center', + }, +}); From ba5706f3b98b7d57f99f468407c9599d95b020ea Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:19:25 +0200 Subject: [PATCH 425/505] Revert "Revert search changes" --- src/config/locales/en-US.json | 1 - src/providers/hive/dhive.js | 7 +- .../container/communitiesContainer.js | 2 +- .../container/otherResultContainer.js | 4 +- .../searchResult/screen/searchResultScreen.js | 26 ++-- .../searchResult/screen/searchResultStyles.js | 3 + .../screen/tabs/best/postResult.js | 115 ++++++++++++++++++ .../screen/tabs/best/postResultStyles.js | 44 +++++++ .../tabs/communities/CommunitiesListItem.js | 80 ++++++++++++ .../screen/tabs/communities/communities.js | 108 ++++++++++++++++ .../tabs/communities/communitiesList.js | 70 +++++++++++ .../communities/communitiesListItemStyles.js | 62 ++++++++++ .../tabs/communities/communitiesListStyles.js | 16 +++ .../screen/tabs/topics/otherResults.js | 100 +++++++++++++++ .../screen/tabs/topics/otherResultsStyles.js | 48 ++++++++ 15 files changed, 670 insertions(+), 16 deletions(-) create mode 100644 src/screens/searchResult/screen/tabs/best/postResult.js create mode 100644 src/screens/searchResult/screen/tabs/best/postResultStyles.js create mode 100644 src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js create mode 100644 src/screens/searchResult/screen/tabs/communities/communities.js create mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesList.js create mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js create mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js create mode 100644 src/screens/searchResult/screen/tabs/topics/otherResults.js create mode 100644 src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index fa301490e7..a101ec578c 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -538,7 +538,6 @@ "more_replies": "more replies" }, "search_result": { - "others": "Others", "best": { "title": "Best" }, diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index 45914f0683..db7ceea2a1 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -1130,8 +1130,7 @@ export const lookupAccounts = async (username) => { return users; } catch (error) { console.log('lookup_accounts'); - return []; - //throw error; + throw error; } }; @@ -1140,8 +1139,8 @@ export const getTrendingTags = async (tag) => { const tags = await client.database.call('get_trending_tags', [tag, 20]); return tags; } catch (error) { - return []; - //throw error; + console.log('get_trending_tags'); + throw error; } }; diff --git a/src/screens/searchResult/container/communitiesContainer.js b/src/screens/searchResult/container/communitiesContainer.js index fee6658124..bfbd4d9523 100644 --- a/src/screens/searchResult/container/communitiesContainer.js +++ b/src/screens/searchResult/container/communitiesContainer.js @@ -6,9 +6,9 @@ import isEmpty from 'lodash/isEmpty'; import ROUTES from '../../../constants/routeNames'; import { - subscribeCommunity, getCommunities, getSubscriptions, + subscribeCommunity, } from '../../../providers/hive/dhive'; const CommunitiesContainer = ({ diff --git a/src/screens/searchResult/container/otherResultContainer.js b/src/screens/searchResult/container/otherResultContainer.js index 9ee3cbd6c8..3c62bdff76 100644 --- a/src/screens/searchResult/container/otherResultContainer.js +++ b/src/screens/searchResult/container/otherResultContainer.js @@ -20,10 +20,10 @@ const OtherResultContainer = (props) => { setTags([]); if (searchValue) { - lookupAccounts(searchValue.replace(/\s+/g, '')).then((res) => { + lookupAccounts(searchValue).then((res) => { setUsers(res); }); - getTrendingTags(searchValue.replace(/\s+/g, '')).then((res) => { + getTrendingTags(searchValue).then((res) => { setTags(res); }); } else { diff --git a/src/screens/searchResult/screen/searchResultScreen.js b/src/screens/searchResult/screen/searchResultScreen.js index d174bfbca8..99f28f3216 100644 --- a/src/screens/searchResult/screen/searchResultScreen.js +++ b/src/screens/searchResult/screen/searchResultScreen.js @@ -5,9 +5,9 @@ import { useIntl } from 'react-intl'; // Components import { SearchInput, TabBar } from '../../../components'; -import Communities from './communities'; -import PostResult from './postResult'; -import OtherResult from './otherResults'; +import Communities from './tabs/communities/communities'; +import PostResult from './tabs/best/postResult'; +import OtherResult from './tabs/topics/otherResults'; // Styles import styles from './searchResultStyles'; @@ -36,6 +36,7 @@ const SearchResultScreen = ({ navigation }) => { tabUnderlineDefaultWidth={80} tabUnderlineScaleX={2} tabBarPosition="overlayTop" + textStyle={styles.tabBarText} /> ); @@ -54,20 +55,29 @@ const SearchResultScreen = ({ navigation }) => { prerenderingSiblingsNumber={Infinity} > - - - + + + + + + ); diff --git a/src/screens/searchResult/screen/searchResultStyles.js b/src/screens/searchResult/screen/searchResultStyles.js index 0ef7bc05b2..2c4a24638a 100644 --- a/src/screens/searchResult/screen/searchResultStyles.js +++ b/src/screens/searchResult/screen/searchResultStyles.js @@ -28,4 +28,7 @@ export default EStyleSheet.create({ tabs: { flex: 1, }, + tabBarText: { + fontSize: 14, + }, }); diff --git a/src/screens/searchResult/screen/tabs/best/postResult.js b/src/screens/searchResult/screen/tabs/best/postResult.js new file mode 100644 index 0000000000..d49a3fd424 --- /dev/null +++ b/src/screens/searchResult/screen/tabs/best/postResult.js @@ -0,0 +1,115 @@ +import React from 'react'; +import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; +import get from 'lodash/get'; +import isUndefined from 'lodash/isUndefined'; +import FastImage from 'react-native-fast-image'; +import { useIntl } from 'react-intl'; + +// Components +import { PostHeaderDescription, FilterBar } from '../../../../../components'; +import { TextWithIcon, CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; +import PostResultContainer from '../../../container/postResultContainer'; + +import { getTimeFromNow } from '../../../../../utils/time'; + +import styles from './postResultStyles'; + +import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; + +const filterOptions = ['relevance', 'popularity', 'newest']; + +const PostResult = ({ navigation, searchValue }) => { + const intl = useIntl(); + + const _renderItem = (item, index) => { + return ( + + + + + {item.title} + {!!item.body && ( + + {item.body} + + )} + + + {!isUndefined(item.payout) && ( + {`$ ${item.payout}`} + )} + + + + + ); + }; + + const _renderEmptyContent = () => { + return ( + <> + + + + + + + + + ); + }; + + return ( + + {({ data, filterIndex, handleFilterChanged, handleOnPress, loadMore }) => ( + + + intl.formatMessage({ + id: `search_result.post_result_filter.${item}`, + }), + )} + defaultText={intl.formatMessage({ + id: `search_result.post_result_filter.${filterOptions[filterIndex]}`, + })} + selectedOptionIndex={filterIndex} + onDropdownSelect={(index) => handleFilterChanged(index, filterOptions[index])} + /> + item.id && item.id.toString()} + renderItem={({ item, index }) => ( + handleOnPress(item)}> + {_renderItem(item, index)} + + )} + onEndReached={loadMore} + ListEmptyComponent={_renderEmptyContent} + ListFooterComponent={} + /> + + )} + + ); +}; + +export default PostResult; diff --git a/src/screens/searchResult/screen/tabs/best/postResultStyles.js b/src/screens/searchResult/screen/tabs/best/postResultStyles.js new file mode 100644 index 0000000000..db40ab8fec --- /dev/null +++ b/src/screens/searchResult/screen/tabs/best/postResultStyles.js @@ -0,0 +1,44 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + backgroundColor: '$primaryBackgroundColor', + }, + title: { + fontSize: 16, + fontWeight: 'bold', + marginVertical: 5, + color: '$primaryBlack', + }, + summary: { + fontSize: 13, + color: '$primaryDarkGray', + }, + itemWrapper: { + paddingHorizontal: 16, + paddingTop: 16, + paddingBottom: 8, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + }, + itemWrapperGray: { + backgroundColor: '$primaryLightBackground', + }, + stats: { + flexDirection: 'row', + }, + postIcon: { + alignSelf: 'flex-start', + fontSize: 20, + color: '$iconColor', + margin: 0, + width: 20, + marginLeft: 25, + }, + postIconText: { + color: '$primaryDarkGray', + fontSize: 13, + alignSelf: 'center', + }, +}); diff --git a/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js b/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js new file mode 100644 index 0000000000..10de0c140e --- /dev/null +++ b/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js @@ -0,0 +1,80 @@ +import React, { useState } from 'react'; +import { View, Text, TouchableOpacity } from 'react-native'; +import { useIntl } from 'react-intl'; + +import styles from './communitiesListItemStyles'; + +import { Tag } from '../../../../../components/basicUIElements'; + +const UserListItem = ({ + index, + handleOnPress, + handleOnLongPress, + title, + about, + admins, + id, + authors, + posts, + subscribers, + isNsfw, + name, + handleSubscribeButtonPress, + isSubscribed, + isLoggedIn, +}) => { + const [subscribed, setSubscribed] = useState(isSubscribed); + const intl = useIntl(); + + const _handleSubscribeButtonPress = () => { + handleSubscribeButtonPress({ subscribed: !subscribed, communityId: name }).then(() => { + setSubscribed(!subscribed); + }); + }; + + return ( + handleOnLongPress && handleOnLongPress()} + onPress={() => handleOnPress && handleOnPress(name)} + > + + + + {title} + {isLoggedIn && ( + + )} + + {!!about && {about}} + + + {`${subscribers.toString()} ${intl.formatMessage({ + id: 'search_result.communities.subscribers', + })} • ${authors.toString()} ${intl.formatMessage({ + id: 'search_result.communities.posters', + })} • ${posts} ${intl.formatMessage({ + id: 'search_result.communities.posts', + })}`} + + + + + ); +}; + +export default UserListItem; diff --git a/src/screens/searchResult/screen/tabs/communities/communities.js b/src/screens/searchResult/screen/tabs/communities/communities.js new file mode 100644 index 0000000000..d053585528 --- /dev/null +++ b/src/screens/searchResult/screen/tabs/communities/communities.js @@ -0,0 +1,108 @@ +import React from 'react'; +import { useIntl } from 'react-intl'; +import { FlatList, View, Text, TouchableOpacity } from 'react-native'; +import get from 'lodash/get'; + +// Components +import { FilterBar, UserAvatar } from '../../../../../components'; +import CommunitiesList from './communitiesList'; +import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; + +import CommunitiesContainer from '../../../container/communitiesContainer'; +import styles from '../topics/otherResultsStyles'; +import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; +import Tag from '../../../../../components/basicUIElements/view/tag/tagView'; + +const filterOptions = ['my', 'rank', 'subs', 'new']; + +const CommunitiesScreen = ({ navigation, searchValue }) => { + const intl = useIntl(); + + const activeVotes = get(navigation, 'state.params.activeVotes'); + + const _renderEmptyContent = () => { + return ( + <> + + + + + ); + }; + + return ( + + {({ + data, + filterIndex, + allSubscriptions, + handleOnVotersDropdownSelect, + handleOnPress, + handleSubscribeButtonPress, + isLoggedIn, + noResult, + }) => ( + <> + + intl.formatMessage({ + id: `search_result.communities_filter.${item}`, + }), + )} + defaultText={intl.formatMessage({ + id: `search_result.communities_filter.${filterOptions[filterIndex]}`, + })} + selectedOptionIndex={filterIndex} + onDropdownSelect={(index) => handleOnVotersDropdownSelect(index, filterOptions[index])} + /> + {filterIndex !== 0 && ( + + )} + {filterIndex === 0 && allSubscriptions && allSubscriptions.length > 0 && ( + `${item}-${ind}`} + renderItem={({ item, index }) => ( + + + handleOnPress(item[0])}> + + + handleOnPress(item[0])}> + {item[1]} + + + + + handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) + } + /> + + + )} + ListEmptyComponent={_renderEmptyContent} + /> + )} + + )} + + ); +}; + +export default CommunitiesScreen; diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesList.js b/src/screens/searchResult/screen/tabs/communities/communitiesList.js new file mode 100644 index 0000000000..da58020abc --- /dev/null +++ b/src/screens/searchResult/screen/tabs/communities/communitiesList.js @@ -0,0 +1,70 @@ +import React from 'react'; +import { SafeAreaView, FlatList } from 'react-native'; + +// Components +import { CommunityListItem } from '../../../../../components/basicUIElements'; +import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; + +// Styles +import styles from './communitiesListStyles'; + +const CommunitiesList = ({ + votes, + handleOnPress, + handleSubscribeButtonPress, + allSubscriptions, + isLoggedIn, + noResult, +}) => { + const _renderItem = ({ item, index }) => { + const isSubscribed = allSubscriptions.some((sub) => sub[0] === item.name); + + return ( + + ); + }; + + const _renderEmptyContent = () => { + return ( + <> + + + + + + + + + ); + }; + + return ( + + {!noResult && ( + item.id && item.id.toString()} + renderItem={_renderItem} + ListEmptyComponent={_renderEmptyContent} + /> + )} + + ); +}; + +export default CommunitiesList; diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js b/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js new file mode 100644 index 0000000000..19880705c4 --- /dev/null +++ b/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js @@ -0,0 +1,62 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + padding: 8, + flexDirection: 'row', + }, + content: { + flexDirection: 'column', + marginLeft: 8, + width: '100%', + }, + itemWrapper: { + alignItems: 'center', + padding: 16, + borderRadius: 8, + flexDirection: 'row', + backgroundColor: '$primaryBackgroundColor', + }, + itemWrapperGray: { + backgroundColor: '$primaryLightBackground', + }, + title: { + color: '$primaryBlue', + fontSize: 17, + fontWeight: 'bold', + fontFamily: '$primaryFont', + }, + about: { + fontSize: 14, + fontFamily: '$primaryFont', + marginTop: 5, + paddingTop: 10, + color: '$primaryBlack', + }, + separator: { + width: 100, + alignSelf: 'center', + backgroundColor: '$primaryDarkGray', + height: 1, + marginVertical: 10, + }, + stats: { + fontSize: 14, + fontFamily: '$primaryFont', + color: '$primaryDarkGray', + paddingBottom: 10, + }, + subscribeButton: { + borderWidth: 1, + maxWidth: 75, + borderColor: '$primaryBlue', + }, + subscribeButtonText: { + textAlign: 'center', + color: '$primaryBlue', + }, + header: { + flexDirection: 'row', + justifyContent: 'space-between', + }, +}); diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js b/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js new file mode 100644 index 0000000000..8423a2e5e1 --- /dev/null +++ b/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js @@ -0,0 +1,16 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + padding: 8, + marginBottom: 40, + flexDirection: 'row', + backgroundColor: '$primaryBackgroundColor', + }, + text: { + color: '$iconColor', + fontSize: 12, + fontFamily: '$primaryFont', + }, +}); diff --git a/src/screens/searchResult/screen/tabs/topics/otherResults.js b/src/screens/searchResult/screen/tabs/topics/otherResults.js new file mode 100644 index 0000000000..aa3c948f0b --- /dev/null +++ b/src/screens/searchResult/screen/tabs/topics/otherResults.js @@ -0,0 +1,100 @@ +import React from 'react'; +import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; +import { useIntl } from 'react-intl'; + +// Components +import { FilterBar, UserAvatar } from '../../../../../components'; +import { CommunitiesPlaceHolder, UserListItem } from '../../../../../components/basicUIElements'; +import OtherResultContainer from '../../../container/otherResultContainer'; + +import styles from './otherResultsStyles'; + +const filterOptions = ['user', 'tag']; + +const OtherResult = ({ navigation, searchValue }) => { + const intl = useIntl(); + + const _renderTagItem = (item, index) => ( + + {`#${item.name}`} + + ); + + const _renderEmptyContent = () => { + return ( + <> + + + + + + + + + ); + }; + + const _renderList = (users, tags, filterIndex, handleOnPress) => { + switch (filterIndex) { + case 0: + if (users && users.length > 0) { + return ( + `${item}-${ind}`} + renderItem={({ item, index }) => ( + handleOnPress(item)} + index={index} + username={item} + /> + )} + ListEmptyComponent={_renderEmptyContent} + /> + ); + } + case 1: + if (tags && tags.length > 0) { + return ( + item.id} + renderItem={({ item, index }) => ( + handleOnPress(item)}> + {_renderTagItem(item, index)} + + )} + ListEmptyComponent={_renderEmptyContent} + /> + ); + } + default: + break; + } + }; + + return ( + + {({ users, tags, filterIndex, handleFilterChanged, handleOnPress, loadMore }) => ( + + + intl.formatMessage({ + id: `search_result.other_result_filter.${item}`, + }), + )} + defaultText={intl.formatMessage({ + id: `search_result.other_result_filter.${filterOptions[filterIndex]}`, + })} + selectedOptionIndex={filterIndex} + onDropdownSelect={(index) => handleFilterChanged(index, filterOptions[index])} + /> + {_renderList(users, tags, filterIndex, handleOnPress)} + + )} + + ); +}; + +export default OtherResult; diff --git a/src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js b/src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js new file mode 100644 index 0000000000..6fe3db6757 --- /dev/null +++ b/src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js @@ -0,0 +1,48 @@ +import EStyleSheet from 'react-native-extended-stylesheet'; + +export default EStyleSheet.create({ + container: { + flex: 1, + backgroundColor: '$primaryBackgroundColor', + }, + itemWrapper: { + paddingHorizontal: 16, + paddingTop: 16, + paddingBottom: 8, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + flexDirection: 'row', + alignItems: 'center', + }, + itemWrapperGray: { + backgroundColor: '$primaryLightBackground', + }, + username: { + marginLeft: 10, + color: '$primaryBlack', + }, + communityWrapper: { + paddingHorizontal: 16, + paddingTop: 10, + paddingBottom: 10, + borderRadius: 8, + backgroundColor: '$primaryBackgroundColor', + flexDirection: 'row', + alignItems: 'center', + flex: 1, + }, + subscribeButton: { + maxWidth: 75, + borderWidth: 1, + borderColor: '$primaryBlue', + }, + subscribeButtonText: { + textAlign: 'center', + color: '$primaryBlue', + }, + community: { + justifyContent: 'center', + marginLeft: 15, + color: '$primaryBlack', + }, +}); From bf60870f926c069d5d204637db1393983b9d77bb Mon Sep 17 00:00:00 2001 From: feruzm Date: Thu, 7 Jan 2021 11:36:41 +0200 Subject: [PATCH 426/505] revert correctly --- src/config/locales/en-US.json | 1 + src/providers/hive/dhive.js | 8 +- .../container/communitiesContainer.js | 2 +- .../container/otherResultContainer.js | 4 +- .../searchResult/screen/otherResults.js | 2 +- .../searchResult/screen/searchResultScreen.js | 26 ++-- .../searchResult/screen/searchResultStyles.js | 3 - .../screen/tabs/best/postResult.js | 115 ------------------ .../screen/tabs/best/postResultStyles.js | 44 ------- .../tabs/communities/CommunitiesListItem.js | 80 ------------ .../screen/tabs/communities/communities.js | 108 ---------------- .../tabs/communities/communitiesList.js | 70 ----------- .../communities/communitiesListItemStyles.js | 62 ---------- .../tabs/communities/communitiesListStyles.js | 16 --- .../screen/tabs/topics/otherResults.js | 100 --------------- .../screen/tabs/topics/otherResultsStyles.js | 48 -------- 16 files changed, 17 insertions(+), 672 deletions(-) delete mode 100644 src/screens/searchResult/screen/tabs/best/postResult.js delete mode 100644 src/screens/searchResult/screen/tabs/best/postResultStyles.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communities.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesList.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js delete mode 100644 src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js delete mode 100644 src/screens/searchResult/screen/tabs/topics/otherResults.js delete mode 100644 src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index a101ec578c..fa301490e7 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index db7ceea2a1..7639c6f5ef 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -1129,8 +1129,8 @@ export const lookupAccounts = async (username) => { const users = await client.database.call('lookup_accounts', [username, 20]); return users; } catch (error) { - console.log('lookup_accounts'); - throw error; + return []; + //throw error; } }; @@ -1139,8 +1139,8 @@ export const getTrendingTags = async (tag) => { const tags = await client.database.call('get_trending_tags', [tag, 20]); return tags; } catch (error) { - console.log('get_trending_tags'); - throw error; + return []; + //throw error; } }; diff --git a/src/screens/searchResult/container/communitiesContainer.js b/src/screens/searchResult/container/communitiesContainer.js index bfbd4d9523..fee6658124 100644 --- a/src/screens/searchResult/container/communitiesContainer.js +++ b/src/screens/searchResult/container/communitiesContainer.js @@ -6,9 +6,9 @@ import isEmpty from 'lodash/isEmpty'; import ROUTES from '../../../constants/routeNames'; import { + subscribeCommunity, getCommunities, getSubscriptions, - subscribeCommunity, } from '../../../providers/hive/dhive'; const CommunitiesContainer = ({ diff --git a/src/screens/searchResult/container/otherResultContainer.js b/src/screens/searchResult/container/otherResultContainer.js index 3c62bdff76..9ee3cbd6c8 100644 --- a/src/screens/searchResult/container/otherResultContainer.js +++ b/src/screens/searchResult/container/otherResultContainer.js @@ -20,10 +20,10 @@ const OtherResultContainer = (props) => { setTags([]); if (searchValue) { - lookupAccounts(searchValue).then((res) => { + lookupAccounts(searchValue.replace(/\s+/g, '')).then((res) => { setUsers(res); }); - getTrendingTags(searchValue).then((res) => { + getTrendingTags(searchValue.replace(/\s+/g, '')).then((res) => { setTags(res); }); } else { diff --git a/src/screens/searchResult/screen/otherResults.js b/src/screens/searchResult/screen/otherResults.js index 213b0410ab..41e7eef3f2 100644 --- a/src/screens/searchResult/screen/otherResults.js +++ b/src/screens/searchResult/screen/otherResults.js @@ -65,7 +65,7 @@ const OtherResult = ({ navigation, searchValue }) => { return ( `${item.name}+${item.id}+${item.comments}`} + keyExtractor={(item) => `${item.name}-${item.comments}`} renderItem={({ item, index }) => ( handleOnPress(item)}> {_renderTagItem(item, index)} diff --git a/src/screens/searchResult/screen/searchResultScreen.js b/src/screens/searchResult/screen/searchResultScreen.js index 99f28f3216..d174bfbca8 100644 --- a/src/screens/searchResult/screen/searchResultScreen.js +++ b/src/screens/searchResult/screen/searchResultScreen.js @@ -5,9 +5,9 @@ import { useIntl } from 'react-intl'; // Components import { SearchInput, TabBar } from '../../../components'; -import Communities from './tabs/communities/communities'; -import PostResult from './tabs/best/postResult'; -import OtherResult from './tabs/topics/otherResults'; +import Communities from './communities'; +import PostResult from './postResult'; +import OtherResult from './otherResults'; // Styles import styles from './searchResultStyles'; @@ -36,7 +36,6 @@ const SearchResultScreen = ({ navigation }) => { tabUnderlineDefaultWidth={80} tabUnderlineScaleX={2} tabBarPosition="overlayTop" - textStyle={styles.tabBarText} /> ); @@ -55,29 +54,20 @@ const SearchResultScreen = ({ navigation }) => { prerenderingSiblingsNumber={Infinity} > - + - - + + - - - ); diff --git a/src/screens/searchResult/screen/searchResultStyles.js b/src/screens/searchResult/screen/searchResultStyles.js index 2c4a24638a..0ef7bc05b2 100644 --- a/src/screens/searchResult/screen/searchResultStyles.js +++ b/src/screens/searchResult/screen/searchResultStyles.js @@ -28,7 +28,4 @@ export default EStyleSheet.create({ tabs: { flex: 1, }, - tabBarText: { - fontSize: 14, - }, }); diff --git a/src/screens/searchResult/screen/tabs/best/postResult.js b/src/screens/searchResult/screen/tabs/best/postResult.js deleted file mode 100644 index d49a3fd424..0000000000 --- a/src/screens/searchResult/screen/tabs/best/postResult.js +++ /dev/null @@ -1,115 +0,0 @@ -import React from 'react'; -import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; -import get from 'lodash/get'; -import isUndefined from 'lodash/isUndefined'; -import FastImage from 'react-native-fast-image'; -import { useIntl } from 'react-intl'; - -// Components -import { PostHeaderDescription, FilterBar } from '../../../../../components'; -import { TextWithIcon, CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; -import PostResultContainer from '../../../container/postResultContainer'; - -import { getTimeFromNow } from '../../../../../utils/time'; - -import styles from './postResultStyles'; - -import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; - -const filterOptions = ['relevance', 'popularity', 'newest']; - -const PostResult = ({ navigation, searchValue }) => { - const intl = useIntl(); - - const _renderItem = (item, index) => { - return ( - - - - - {item.title} - {!!item.body && ( - - {item.body} - - )} - - - {!isUndefined(item.payout) && ( - {`$ ${item.payout}`} - )} - - - - - ); - }; - - const _renderEmptyContent = () => { - return ( - <> - - - - - - - - - ); - }; - - return ( - - {({ data, filterIndex, handleFilterChanged, handleOnPress, loadMore }) => ( - - - intl.formatMessage({ - id: `search_result.post_result_filter.${item}`, - }), - )} - defaultText={intl.formatMessage({ - id: `search_result.post_result_filter.${filterOptions[filterIndex]}`, - })} - selectedOptionIndex={filterIndex} - onDropdownSelect={(index) => handleFilterChanged(index, filterOptions[index])} - /> - item.id && item.id.toString()} - renderItem={({ item, index }) => ( - handleOnPress(item)}> - {_renderItem(item, index)} - - )} - onEndReached={loadMore} - ListEmptyComponent={_renderEmptyContent} - ListFooterComponent={} - /> - - )} - - ); -}; - -export default PostResult; diff --git a/src/screens/searchResult/screen/tabs/best/postResultStyles.js b/src/screens/searchResult/screen/tabs/best/postResultStyles.js deleted file mode 100644 index db40ab8fec..0000000000 --- a/src/screens/searchResult/screen/tabs/best/postResultStyles.js +++ /dev/null @@ -1,44 +0,0 @@ -import EStyleSheet from 'react-native-extended-stylesheet'; - -export default EStyleSheet.create({ - container: { - flex: 1, - backgroundColor: '$primaryBackgroundColor', - }, - title: { - fontSize: 16, - fontWeight: 'bold', - marginVertical: 5, - color: '$primaryBlack', - }, - summary: { - fontSize: 13, - color: '$primaryDarkGray', - }, - itemWrapper: { - paddingHorizontal: 16, - paddingTop: 16, - paddingBottom: 8, - borderRadius: 8, - backgroundColor: '$primaryBackgroundColor', - }, - itemWrapperGray: { - backgroundColor: '$primaryLightBackground', - }, - stats: { - flexDirection: 'row', - }, - postIcon: { - alignSelf: 'flex-start', - fontSize: 20, - color: '$iconColor', - margin: 0, - width: 20, - marginLeft: 25, - }, - postIconText: { - color: '$primaryDarkGray', - fontSize: 13, - alignSelf: 'center', - }, -}); diff --git a/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js b/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js deleted file mode 100644 index 10de0c140e..0000000000 --- a/src/screens/searchResult/screen/tabs/communities/CommunitiesListItem.js +++ /dev/null @@ -1,80 +0,0 @@ -import React, { useState } from 'react'; -import { View, Text, TouchableOpacity } from 'react-native'; -import { useIntl } from 'react-intl'; - -import styles from './communitiesListItemStyles'; - -import { Tag } from '../../../../../components/basicUIElements'; - -const UserListItem = ({ - index, - handleOnPress, - handleOnLongPress, - title, - about, - admins, - id, - authors, - posts, - subscribers, - isNsfw, - name, - handleSubscribeButtonPress, - isSubscribed, - isLoggedIn, -}) => { - const [subscribed, setSubscribed] = useState(isSubscribed); - const intl = useIntl(); - - const _handleSubscribeButtonPress = () => { - handleSubscribeButtonPress({ subscribed: !subscribed, communityId: name }).then(() => { - setSubscribed(!subscribed); - }); - }; - - return ( - handleOnLongPress && handleOnLongPress()} - onPress={() => handleOnPress && handleOnPress(name)} - > - - - - {title} - {isLoggedIn && ( - - )} - - {!!about && {about}} - - - {`${subscribers.toString()} ${intl.formatMessage({ - id: 'search_result.communities.subscribers', - })} • ${authors.toString()} ${intl.formatMessage({ - id: 'search_result.communities.posters', - })} • ${posts} ${intl.formatMessage({ - id: 'search_result.communities.posts', - })}`} - - - - - ); -}; - -export default UserListItem; diff --git a/src/screens/searchResult/screen/tabs/communities/communities.js b/src/screens/searchResult/screen/tabs/communities/communities.js deleted file mode 100644 index d053585528..0000000000 --- a/src/screens/searchResult/screen/tabs/communities/communities.js +++ /dev/null @@ -1,108 +0,0 @@ -import React from 'react'; -import { useIntl } from 'react-intl'; -import { FlatList, View, Text, TouchableOpacity } from 'react-native'; -import get from 'lodash/get'; - -// Components -import { FilterBar, UserAvatar } from '../../../../../components'; -import CommunitiesList from './communitiesList'; -import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; - -import CommunitiesContainer from '../../../container/communitiesContainer'; -import styles from '../topics/otherResultsStyles'; -import DEFAULT_IMAGE from '../../../../../assets/no_image.png'; -import Tag from '../../../../../components/basicUIElements/view/tag/tagView'; - -const filterOptions = ['my', 'rank', 'subs', 'new']; - -const CommunitiesScreen = ({ navigation, searchValue }) => { - const intl = useIntl(); - - const activeVotes = get(navigation, 'state.params.activeVotes'); - - const _renderEmptyContent = () => { - return ( - <> - - - - - ); - }; - - return ( - - {({ - data, - filterIndex, - allSubscriptions, - handleOnVotersDropdownSelect, - handleOnPress, - handleSubscribeButtonPress, - isLoggedIn, - noResult, - }) => ( - <> - - intl.formatMessage({ - id: `search_result.communities_filter.${item}`, - }), - )} - defaultText={intl.formatMessage({ - id: `search_result.communities_filter.${filterOptions[filterIndex]}`, - })} - selectedOptionIndex={filterIndex} - onDropdownSelect={(index) => handleOnVotersDropdownSelect(index, filterOptions[index])} - /> - {filterIndex !== 0 && ( - - )} - {filterIndex === 0 && allSubscriptions && allSubscriptions.length > 0 && ( - `${item}-${ind}`} - renderItem={({ item, index }) => ( - - - handleOnPress(item[0])}> - - - handleOnPress(item[0])}> - {item[1]} - - - - - handleSubscribeButtonPress({ isSubscribed: true, communityId: item[0] }) - } - /> - - - )} - ListEmptyComponent={_renderEmptyContent} - /> - )} - - )} - - ); -}; - -export default CommunitiesScreen; diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesList.js b/src/screens/searchResult/screen/tabs/communities/communitiesList.js deleted file mode 100644 index da58020abc..0000000000 --- a/src/screens/searchResult/screen/tabs/communities/communitiesList.js +++ /dev/null @@ -1,70 +0,0 @@ -import React from 'react'; -import { SafeAreaView, FlatList } from 'react-native'; - -// Components -import { CommunityListItem } from '../../../../../components/basicUIElements'; -import { CommunitiesPlaceHolder } from '../../../../../components/basicUIElements'; - -// Styles -import styles from './communitiesListStyles'; - -const CommunitiesList = ({ - votes, - handleOnPress, - handleSubscribeButtonPress, - allSubscriptions, - isLoggedIn, - noResult, -}) => { - const _renderItem = ({ item, index }) => { - const isSubscribed = allSubscriptions.some((sub) => sub[0] === item.name); - - return ( - - ); - }; - - const _renderEmptyContent = () => { - return ( - <> - - - - - - - - - ); - }; - - return ( - - {!noResult && ( - item.id && item.id.toString()} - renderItem={_renderItem} - ListEmptyComponent={_renderEmptyContent} - /> - )} - - ); -}; - -export default CommunitiesList; diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js b/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js deleted file mode 100644 index 19880705c4..0000000000 --- a/src/screens/searchResult/screen/tabs/communities/communitiesListItemStyles.js +++ /dev/null @@ -1,62 +0,0 @@ -import EStyleSheet from 'react-native-extended-stylesheet'; - -export default EStyleSheet.create({ - container: { - padding: 8, - flexDirection: 'row', - }, - content: { - flexDirection: 'column', - marginLeft: 8, - width: '100%', - }, - itemWrapper: { - alignItems: 'center', - padding: 16, - borderRadius: 8, - flexDirection: 'row', - backgroundColor: '$primaryBackgroundColor', - }, - itemWrapperGray: { - backgroundColor: '$primaryLightBackground', - }, - title: { - color: '$primaryBlue', - fontSize: 17, - fontWeight: 'bold', - fontFamily: '$primaryFont', - }, - about: { - fontSize: 14, - fontFamily: '$primaryFont', - marginTop: 5, - paddingTop: 10, - color: '$primaryBlack', - }, - separator: { - width: 100, - alignSelf: 'center', - backgroundColor: '$primaryDarkGray', - height: 1, - marginVertical: 10, - }, - stats: { - fontSize: 14, - fontFamily: '$primaryFont', - color: '$primaryDarkGray', - paddingBottom: 10, - }, - subscribeButton: { - borderWidth: 1, - maxWidth: 75, - borderColor: '$primaryBlue', - }, - subscribeButtonText: { - textAlign: 'center', - color: '$primaryBlue', - }, - header: { - flexDirection: 'row', - justifyContent: 'space-between', - }, -}); diff --git a/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js b/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js deleted file mode 100644 index 8423a2e5e1..0000000000 --- a/src/screens/searchResult/screen/tabs/communities/communitiesListStyles.js +++ /dev/null @@ -1,16 +0,0 @@ -import EStyleSheet from 'react-native-extended-stylesheet'; - -export default EStyleSheet.create({ - container: { - flex: 1, - padding: 8, - marginBottom: 40, - flexDirection: 'row', - backgroundColor: '$primaryBackgroundColor', - }, - text: { - color: '$iconColor', - fontSize: 12, - fontFamily: '$primaryFont', - }, -}); diff --git a/src/screens/searchResult/screen/tabs/topics/otherResults.js b/src/screens/searchResult/screen/tabs/topics/otherResults.js deleted file mode 100644 index aa3c948f0b..0000000000 --- a/src/screens/searchResult/screen/tabs/topics/otherResults.js +++ /dev/null @@ -1,100 +0,0 @@ -import React from 'react'; -import { SafeAreaView, FlatList, View, Text, TouchableOpacity } from 'react-native'; -import { useIntl } from 'react-intl'; - -// Components -import { FilterBar, UserAvatar } from '../../../../../components'; -import { CommunitiesPlaceHolder, UserListItem } from '../../../../../components/basicUIElements'; -import OtherResultContainer from '../../../container/otherResultContainer'; - -import styles from './otherResultsStyles'; - -const filterOptions = ['user', 'tag']; - -const OtherResult = ({ navigation, searchValue }) => { - const intl = useIntl(); - - const _renderTagItem = (item, index) => ( - - {`#${item.name}`} - - ); - - const _renderEmptyContent = () => { - return ( - <> - - - - - - - - - ); - }; - - const _renderList = (users, tags, filterIndex, handleOnPress) => { - switch (filterIndex) { - case 0: - if (users && users.length > 0) { - return ( - `${item}-${ind}`} - renderItem={({ item, index }) => ( - handleOnPress(item)} - index={index} - username={item} - /> - )} - ListEmptyComponent={_renderEmptyContent} - /> - ); - } - case 1: - if (tags && tags.length > 0) { - return ( - item.id} - renderItem={({ item, index }) => ( - handleOnPress(item)}> - {_renderTagItem(item, index)} - - )} - ListEmptyComponent={_renderEmptyContent} - /> - ); - } - default: - break; - } - }; - - return ( - - {({ users, tags, filterIndex, handleFilterChanged, handleOnPress, loadMore }) => ( - - - intl.formatMessage({ - id: `search_result.other_result_filter.${item}`, - }), - )} - defaultText={intl.formatMessage({ - id: `search_result.other_result_filter.${filterOptions[filterIndex]}`, - })} - selectedOptionIndex={filterIndex} - onDropdownSelect={(index) => handleFilterChanged(index, filterOptions[index])} - /> - {_renderList(users, tags, filterIndex, handleOnPress)} - - )} - - ); -}; - -export default OtherResult; diff --git a/src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js b/src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js deleted file mode 100644 index 6fe3db6757..0000000000 --- a/src/screens/searchResult/screen/tabs/topics/otherResultsStyles.js +++ /dev/null @@ -1,48 +0,0 @@ -import EStyleSheet from 'react-native-extended-stylesheet'; - -export default EStyleSheet.create({ - container: { - flex: 1, - backgroundColor: '$primaryBackgroundColor', - }, - itemWrapper: { - paddingHorizontal: 16, - paddingTop: 16, - paddingBottom: 8, - borderRadius: 8, - backgroundColor: '$primaryBackgroundColor', - flexDirection: 'row', - alignItems: 'center', - }, - itemWrapperGray: { - backgroundColor: '$primaryLightBackground', - }, - username: { - marginLeft: 10, - color: '$primaryBlack', - }, - communityWrapper: { - paddingHorizontal: 16, - paddingTop: 10, - paddingBottom: 10, - borderRadius: 8, - backgroundColor: '$primaryBackgroundColor', - flexDirection: 'row', - alignItems: 'center', - flex: 1, - }, - subscribeButton: { - maxWidth: 75, - borderWidth: 1, - borderColor: '$primaryBlue', - }, - subscribeButtonText: { - textAlign: 'center', - color: '$primaryBlue', - }, - community: { - justifyContent: 'center', - marginLeft: 15, - color: '$primaryBlack', - }, -}); From dd98e7b069590c0cc470becf7c47f8d041c22b6a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:51:53 +0200 Subject: [PATCH 427/505] New translations en-US.json (Bengali) --- src/config/locales/bn-BD.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/bn-BD.json b/src/config/locales/bn-BD.json index 9986990a18..8e33bdbefa 100644 --- a/src/config/locales/bn-BD.json +++ b/src/config/locales/bn-BD.json @@ -538,6 +538,7 @@ "more_replies": "আরও উত্তর" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From e1ce642fa58d5971e8edb7d377431f01b1126bec Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:51:55 +0200 Subject: [PATCH 428/505] New translations en-US.json (Estonian) --- src/config/locales/et-EE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/et-EE.json b/src/config/locales/et-EE.json index 946b80de59..9196d4e334 100644 --- a/src/config/locales/et-EE.json +++ b/src/config/locales/et-EE.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From f62eb3b5ddf80e38a77c77fa01f05d77c62fb274 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:51:57 +0200 Subject: [PATCH 429/505] New translations en-US.json (Filipino) --- src/config/locales/fil-PH.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/fil-PH.json b/src/config/locales/fil-PH.json index 471e6ae04b..9a8a6c5ddb 100644 --- a/src/config/locales/fil-PH.json +++ b/src/config/locales/fil-PH.json @@ -538,6 +538,7 @@ "more_replies": "mas maraming tugon" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 657da888a6614562ff34cab5e9b44fa539679dd4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:51:59 +0200 Subject: [PATCH 430/505] New translations en-US.json (Esperanto) --- src/config/locales/eo-UY.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/eo-UY.json b/src/config/locales/eo-UY.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/eo-UY.json +++ b/src/config/locales/eo-UY.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 764bd40c8a30001b8809a278d51f01fe681af3de Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:01 +0200 Subject: [PATCH 431/505] New translations en-US.json (Malay) --- src/config/locales/ms-MY.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ms-MY.json b/src/config/locales/ms-MY.json index 4f3804c289..424ea81e37 100644 --- a/src/config/locales/ms-MY.json +++ b/src/config/locales/ms-MY.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From d53b39b1ae61f0fb22a8c54547723576cb203730 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:03 +0200 Subject: [PATCH 432/505] New translations en-US.json (Kyrgyz) --- src/config/locales/ky-KG.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ky-KG.json b/src/config/locales/ky-KG.json index 03de1c4408..41b739de94 100644 --- a/src/config/locales/ky-KG.json +++ b/src/config/locales/ky-KG.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From ab1d17ce069b87d2702f215902bc0204c0e016e6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:05 +0200 Subject: [PATCH 433/505] New translations en-US.json (Azerbaijani) --- src/config/locales/az-AZ.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/az-AZ.json b/src/config/locales/az-AZ.json index 22a087d976..fcc7c9c4e9 100644 --- a/src/config/locales/az-AZ.json +++ b/src/config/locales/az-AZ.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 8bbce03a1cca0a8baf68bb2c946358bb27bebbdb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:07 +0200 Subject: [PATCH 434/505] New translations en-US.json (Latvian) --- src/config/locales/lv-LV.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/lv-LV.json b/src/config/locales/lv-LV.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/lv-LV.json +++ b/src/config/locales/lv-LV.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 70338713bde7b26c34c0c1828f7802ed251f51c8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:09 +0200 Subject: [PATCH 435/505] New translations en-US.json (Kazakh) --- src/config/locales/kk-KZ.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/kk-KZ.json b/src/config/locales/kk-KZ.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/kk-KZ.json +++ b/src/config/locales/kk-KZ.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From ab0ebcf0ee1575a51b1d4f006fa52121d3f411a8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:11 +0200 Subject: [PATCH 436/505] New translations en-US.json (Bosnian) --- src/config/locales/bs-BA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/bs-BA.json b/src/config/locales/bs-BA.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/bs-BA.json +++ b/src/config/locales/bs-BA.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 3c64ad9ef4695dfbff7b1e39c5a495cc1ec24568 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:13 +0200 Subject: [PATCH 437/505] New translations en-US.json (Croatian) --- src/config/locales/hr-HR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/hr-HR.json b/src/config/locales/hr-HR.json index 1ef9ee2c4a..ad36ce2afe 100644 --- a/src/config/locales/hr-HR.json +++ b/src/config/locales/hr-HR.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 93b12662f132e7615dbbbace5265071ed9ab7b12 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:14 +0200 Subject: [PATCH 438/505] New translations en-US.json (Thai) --- src/config/locales/th-TH.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/th-TH.json b/src/config/locales/th-TH.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/th-TH.json +++ b/src/config/locales/th-TH.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From fd530a66392c614247b5abf1f5563fb0585c8a97 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:16 +0200 Subject: [PATCH 439/505] New translations en-US.json (Tamil) --- src/config/locales/ta-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ta-IN.json b/src/config/locales/ta-IN.json index 8b4ae01488..4ec3ca8ce3 100644 --- a/src/config/locales/ta-IN.json +++ b/src/config/locales/ta-IN.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From de8c8312ff8be7f29fe59f0b96074d86762eb3dd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:18 +0200 Subject: [PATCH 440/505] New translations en-US.json (Persian) --- src/config/locales/fa-IR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/fa-IR.json b/src/config/locales/fa-IR.json index 7443656cd9..8306a92bf9 100644 --- a/src/config/locales/fa-IR.json +++ b/src/config/locales/fa-IR.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 3f14f4c15d2edb409672dcdde07dc427d3250a6c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:20 +0200 Subject: [PATCH 441/505] New translations en-US.json (Indonesian) --- src/config/locales/id-ID.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/id-ID.json b/src/config/locales/id-ID.json index dd132be3fb..26b248085b 100644 --- a/src/config/locales/id-ID.json +++ b/src/config/locales/id-ID.json @@ -538,6 +538,7 @@ "more_replies": "lebih banyak balasan" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 3f428f74067ae54da117515bf1e06345a4b164c8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:22 +0200 Subject: [PATCH 442/505] New translations en-US.json (Icelandic) --- src/config/locales/is-IS.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/is-IS.json b/src/config/locales/is-IS.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/is-IS.json +++ b/src/config/locales/is-IS.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 3db20786bf2868ed346180c8690574b0f244cdee Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:24 +0200 Subject: [PATCH 443/505] New translations en-US.json (Galician) --- src/config/locales/gl-ES.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/gl-ES.json b/src/config/locales/gl-ES.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/gl-ES.json +++ b/src/config/locales/gl-ES.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 1d9bd4d19a0c27ba64d7763c117bbb479bcb952a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:26 +0200 Subject: [PATCH 444/505] New translations en-US.json (Tibetan) --- src/config/locales/bo-BT.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/bo-BT.json b/src/config/locales/bo-BT.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/bo-BT.json +++ b/src/config/locales/bo-BT.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From b2ee34e5917d4dffe2d2e15c30c354800ffc0115 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:28 +0200 Subject: [PATCH 445/505] New translations en-US.json (Uzbek) --- src/config/locales/uz-UZ.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/uz-UZ.json b/src/config/locales/uz-UZ.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/uz-UZ.json +++ b/src/config/locales/uz-UZ.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From f1a2dacc60eb771f9f58f92e51f122386783cc2e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:30 +0200 Subject: [PATCH 446/505] New translations en-US.json (Urdu (Pakistan)) --- src/config/locales/ur-PK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ur-PK.json b/src/config/locales/ur-PK.json index 8076931752..bcf1120b36 100644 --- a/src/config/locales/ur-PK.json +++ b/src/config/locales/ur-PK.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From a01bc67a91903e5624b7146b9028889d2628aa3f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:32 +0200 Subject: [PATCH 447/505] New translations en-US.json (Sanskrit) --- src/config/locales/sa-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sa-IN.json b/src/config/locales/sa-IN.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/sa-IN.json +++ b/src/config/locales/sa-IN.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From ea2b17aff1f463cd75ce9512e4489ae134de0ea8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:34 +0200 Subject: [PATCH 448/505] New translations en-US.json (Spanish, Argentina) --- src/config/locales/es-AR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/es-AR.json b/src/config/locales/es-AR.json index a101ec578c..fa301490e7 100644 --- a/src/config/locales/es-AR.json +++ b/src/config/locales/es-AR.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 3af6ca2de833d77a0e159f8cfa15304810dbe73a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:36 +0200 Subject: [PATCH 449/505] New translations en-US.json (Acehnese) --- src/config/locales/ac-ace.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ac-ace.json b/src/config/locales/ac-ace.json index d5c52f2d2d..00a6094ecc 100644 --- a/src/config/locales/ac-ace.json +++ b/src/config/locales/ac-ace.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From ab0781bdce0a82227da3ce30378e8a3844f8a6f9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:37 +0200 Subject: [PATCH 450/505] New translations en-US.json (Urdu (India)) --- src/config/locales/ur-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ur-IN.json b/src/config/locales/ur-IN.json index 8076931752..bcf1120b36 100644 --- a/src/config/locales/ur-IN.json +++ b/src/config/locales/ur-IN.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 3ad308f1534c403ee32332233ec8b2b3ca6d1bf9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:39 +0200 Subject: [PATCH 451/505] New translations en-US.json (Kabyle) --- src/config/locales/kab-KAB.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/kab-KAB.json b/src/config/locales/kab-KAB.json index 8efbe49c0b..65b016b785 100644 --- a/src/config/locales/kab-KAB.json +++ b/src/config/locales/kab-KAB.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 1e0aface0c9b9c00dd91fae4360bd9807bfe93d3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:41 +0200 Subject: [PATCH 452/505] New translations en-US.json (Gothic) --- src/config/locales/got-DE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/got-DE.json b/src/config/locales/got-DE.json index f4216cfff3..67c3309bb8 100644 --- a/src/config/locales/got-DE.json +++ b/src/config/locales/got-DE.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From a622dd8c3ba9610ea5db3cfa91392710bb27a34f Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:43 +0200 Subject: [PATCH 453/505] New translations en-US.json (Nigerian Pidgin) --- src/config/locales/pcm-NG.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/pcm-NG.json b/src/config/locales/pcm-NG.json index 54f1e396eb..ffab094d04 100644 --- a/src/config/locales/pcm-NG.json +++ b/src/config/locales/pcm-NG.json @@ -538,6 +538,7 @@ "more_replies": "dem replies wey remain" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 275b156b3fc73c750d72c7c9abe4b0c5b798f9a3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:45 +0200 Subject: [PATCH 454/505] New translations en-US.json (Turkmen) --- src/config/locales/tk-TM.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/tk-TM.json b/src/config/locales/tk-TM.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/tk-TM.json +++ b/src/config/locales/tk-TM.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From e64b52c997335282bfe96f2e573232c23e04d31a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:47 +0200 Subject: [PATCH 455/505] New translations en-US.json (Assamese) --- src/config/locales/as-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/as-IN.json b/src/config/locales/as-IN.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/as-IN.json +++ b/src/config/locales/as-IN.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 913e206bcea17baac3a5c6b0365d7db8c78f784e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:49 +0200 Subject: [PATCH 456/505] New translations en-US.json (Kashmiri) --- src/config/locales/ks-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ks-IN.json b/src/config/locales/ks-IN.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/ks-IN.json +++ b/src/config/locales/ks-IN.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 303770af779758689e93fd4cbf614b62644c1dec Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:51 +0200 Subject: [PATCH 457/505] New translations en-US.json (Cebuano) --- src/config/locales/ceb-PH.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ceb-PH.json b/src/config/locales/ceb-PH.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/ceb-PH.json +++ b/src/config/locales/ceb-PH.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 20a2f94a9e9feb2a6c9f53af062181a849826fca Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:53 +0200 Subject: [PATCH 458/505] New translations en-US.json (Yoruba) --- src/config/locales/yo-NG.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/yo-NG.json b/src/config/locales/yo-NG.json index 9e5c4bc92e..161b849393 100644 --- a/src/config/locales/yo-NG.json +++ b/src/config/locales/yo-NG.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 3d252a0c5243594ddb9a74f05f363e2b4275d93c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:55 +0200 Subject: [PATCH 459/505] New translations en-US.json (Tajik) --- src/config/locales/tg-TJ.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/tg-TJ.json b/src/config/locales/tg-TJ.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/tg-TJ.json +++ b/src/config/locales/tg-TJ.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 34541f0c3ef15521685b851f380f2cbe249c2b8d Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:57 +0200 Subject: [PATCH 460/505] New translations en-US.json (Nepali) --- src/config/locales/ne-NP.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ne-NP.json b/src/config/locales/ne-NP.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/ne-NP.json +++ b/src/config/locales/ne-NP.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 0fb55591f7fa2dab908c57c769f9c7b59056f599 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:52:59 +0200 Subject: [PATCH 461/505] New translations en-US.json (Serbian (Latin)) --- src/config/locales/sr-CS.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sr-CS.json b/src/config/locales/sr-CS.json index d68df41112..8e42b5ebe3 100644 --- a/src/config/locales/sr-CS.json +++ b/src/config/locales/sr-CS.json @@ -538,6 +538,7 @@ "more_replies": "još odgovora" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From d41a383eaad3af9ddb6259823afa1bf97f96d666 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:01 +0200 Subject: [PATCH 462/505] New translations en-US.json (Swahili) --- src/config/locales/sw-KE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sw-KE.json b/src/config/locales/sw-KE.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/sw-KE.json +++ b/src/config/locales/sw-KE.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From ed21b7f72d6fe3bd3256ce99731bbcbce817c421 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:03 +0200 Subject: [PATCH 463/505] New translations en-US.json (Vietnamese) --- src/config/locales/vi-VN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/vi-VN.json b/src/config/locales/vi-VN.json index 4acae6f634..4f318f93c5 100644 --- a/src/config/locales/vi-VN.json +++ b/src/config/locales/vi-VN.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 64b91bb4dfd5907e6eae60739975712474bae99c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:05 +0200 Subject: [PATCH 464/505] New translations en-US.json (Chinese Traditional) --- src/config/locales/zh-TW.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/zh-TW.json b/src/config/locales/zh-TW.json index 6afe3b3f4e..1f9973e042 100644 --- a/src/config/locales/zh-TW.json +++ b/src/config/locales/zh-TW.json @@ -538,6 +538,7 @@ "more_replies": "更多回復" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 9f8f50ad41e1ab06dd6080168572b14547dd74cf Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:07 +0200 Subject: [PATCH 465/505] New translations en-US.json (Hindi) --- src/config/locales/hi-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/hi-IN.json b/src/config/locales/hi-IN.json index bc53099212..16c6504d13 100644 --- a/src/config/locales/hi-IN.json +++ b/src/config/locales/hi-IN.json @@ -538,6 +538,7 @@ "more_replies": "अधिक जवाब" }, "search_result": { + "others": "Others", "best": { "title": "सर्वश्रेष्ठ" }, From 656148a8c7e5ae5d38d85ac949988dbde55c66cb Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:08 +0200 Subject: [PATCH 466/505] New translations en-US.json (German) --- src/config/locales/de-DE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/de-DE.json b/src/config/locales/de-DE.json index d2d9eeaba2..bf03273154 100644 --- a/src/config/locales/de-DE.json +++ b/src/config/locales/de-DE.json @@ -538,6 +538,7 @@ "more_replies": "weitere Antworten" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 6561c0e811aa9542b28a934358d78f19d9407b57 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:11 +0200 Subject: [PATCH 467/505] New translations en-US.json (Armenian) --- src/config/locales/hy-AM.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/hy-AM.json b/src/config/locales/hy-AM.json index 6a6774d637..a951761bf4 100644 --- a/src/config/locales/hy-AM.json +++ b/src/config/locales/hy-AM.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 4a133e0bbcff5e9aa98ffb5571cc50254d57a30b Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:13 +0200 Subject: [PATCH 468/505] New translations en-US.json (Hungarian) --- src/config/locales/hu-HU.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/hu-HU.json b/src/config/locales/hu-HU.json index 57e39f2162..995c5c6cc2 100644 --- a/src/config/locales/hu-HU.json +++ b/src/config/locales/hu-HU.json @@ -538,6 +538,7 @@ "more_replies": "további hozzászólások betöltése" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 46d3090a7ddcd2265462c0b1a4b3ae56950187a4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:15 +0200 Subject: [PATCH 469/505] New translations en-US.json (Hebrew) --- src/config/locales/he-IL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/he-IL.json b/src/config/locales/he-IL.json index 44b299ddcb..50a954cd21 100644 --- a/src/config/locales/he-IL.json +++ b/src/config/locales/he-IL.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From d62ea0eebd9008a0d7e0a417aab23796677ec767 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:16 +0200 Subject: [PATCH 470/505] New translations en-US.json (Irish) --- src/config/locales/ga-IE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ga-IE.json b/src/config/locales/ga-IE.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/ga-IE.json +++ b/src/config/locales/ga-IE.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 470b2bc249c73f4d61eef862c856f9a6fda53dc1 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:18 +0200 Subject: [PATCH 471/505] New translations en-US.json (Finnish) --- src/config/locales/fi-FI.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/fi-FI.json b/src/config/locales/fi-FI.json index d2552ddaa3..d5e426e03e 100644 --- a/src/config/locales/fi-FI.json +++ b/src/config/locales/fi-FI.json @@ -538,6 +538,7 @@ "more_replies": "lisää vastauksia" }, "search_result": { + "others": "Others", "best": { "title": "Parhaat" }, From 24d3a49fd2b68845b0569535d76fea44f60dfa5e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:20 +0200 Subject: [PATCH 472/505] New translations en-US.json (Greek) --- src/config/locales/el-GR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/el-GR.json b/src/config/locales/el-GR.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/el-GR.json +++ b/src/config/locales/el-GR.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 91828df54d0a67a5c070a503b6166547feba6a33 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:22 +0200 Subject: [PATCH 473/505] New translations en-US.json (Danish) --- src/config/locales/da-DK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/da-DK.json b/src/config/locales/da-DK.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/da-DK.json +++ b/src/config/locales/da-DK.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 4f1c9b37df49b613bba289737087ba6898fa1c03 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:24 +0200 Subject: [PATCH 474/505] New translations en-US.json (Japanese) --- src/config/locales/ja-JP.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ja-JP.json b/src/config/locales/ja-JP.json index 59207d4b56..4196c6673e 100644 --- a/src/config/locales/ja-JP.json +++ b/src/config/locales/ja-JP.json @@ -538,6 +538,7 @@ "more_replies": "返信をもっと表示" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From d4a25dbc861050992ba33c08db2d4b027f7c8d33 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:26 +0200 Subject: [PATCH 475/505] New translations en-US.json (Czech) --- src/config/locales/cs-CZ.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/cs-CZ.json b/src/config/locales/cs-CZ.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/cs-CZ.json +++ b/src/config/locales/cs-CZ.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 65dd4af70e644136cffa7f95c42d90a3e068c669 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:28 +0200 Subject: [PATCH 476/505] New translations en-US.json (Catalan) --- src/config/locales/ca-ES.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ca-ES.json b/src/config/locales/ca-ES.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/ca-ES.json +++ b/src/config/locales/ca-ES.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 05635c44eae00a08dfabe2921a87b158c481ea31 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:30 +0200 Subject: [PATCH 477/505] New translations en-US.json (Bulgarian) --- src/config/locales/bg-BG.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/bg-BG.json b/src/config/locales/bg-BG.json index 61065e5ff0..a01fc2ad83 100644 --- a/src/config/locales/bg-BG.json +++ b/src/config/locales/bg-BG.json @@ -538,6 +538,7 @@ "more_replies": "още отговори" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From d25441223d7c982e571e7f0557eded015c999031 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:32 +0200 Subject: [PATCH 478/505] New translations en-US.json (Arabic) --- src/config/locales/ar-SA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ar-SA.json b/src/config/locales/ar-SA.json index dbd7804ad4..28bb6c5d8a 100644 --- a/src/config/locales/ar-SA.json +++ b/src/config/locales/ar-SA.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 5ab90f00a3da3404feb405d6ce20415877a82a73 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:34 +0200 Subject: [PATCH 479/505] New translations en-US.json (Spanish) --- src/config/locales/es-ES.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/es-ES.json b/src/config/locales/es-ES.json index cacf499a69..6c55ec4355 100644 --- a/src/config/locales/es-ES.json +++ b/src/config/locales/es-ES.json @@ -538,6 +538,7 @@ "more_replies": "mas comentarios" }, "search_result": { + "others": "Others", "best": { "title": "Mejor" }, From dfe5951e2b2b2784370702a0d2af77f15befa601 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:36 +0200 Subject: [PATCH 480/505] New translations en-US.json (Romanian) --- src/config/locales/ro-RO.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ro-RO.json b/src/config/locales/ro-RO.json index 29cae06d49..4b632438e6 100644 --- a/src/config/locales/ro-RO.json +++ b/src/config/locales/ro-RO.json @@ -538,6 +538,7 @@ "more_replies": "vezi mai multe răspunsuri" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 1190ba17790197cc2b377a02baea8cd7f0c4e65e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:38 +0200 Subject: [PATCH 481/505] New translations en-US.json (French) --- src/config/locales/fr-FR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/fr-FR.json b/src/config/locales/fr-FR.json index 31f6ddd62f..a1b4a25e27 100644 --- a/src/config/locales/fr-FR.json +++ b/src/config/locales/fr-FR.json @@ -538,6 +538,7 @@ "more_replies": "plus de réponses" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From b9dbbcf08d0e5d8a39bda463624c2c26a94c29e8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:39 +0200 Subject: [PATCH 482/505] New translations en-US.json (Italian) --- src/config/locales/it-IT.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/it-IT.json b/src/config/locales/it-IT.json index 995046f7ff..b4aa4005a9 100644 --- a/src/config/locales/it-IT.json +++ b/src/config/locales/it-IT.json @@ -538,6 +538,7 @@ "more_replies": "altre risposte" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From a3f0be165ef2df9533bf1910be34261bcc58918e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:41 +0200 Subject: [PATCH 483/505] New translations en-US.json (Georgian) --- src/config/locales/ka-GE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ka-GE.json b/src/config/locales/ka-GE.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/ka-GE.json +++ b/src/config/locales/ka-GE.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 91037f080913e561198e8d1c79b2baa4780d71bd Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:43 +0200 Subject: [PATCH 484/505] New translations en-US.json (Chinese Simplified) --- src/config/locales/zh-CN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/zh-CN.json b/src/config/locales/zh-CN.json index 23d3682603..5de130024f 100644 --- a/src/config/locales/zh-CN.json +++ b/src/config/locales/zh-CN.json @@ -538,6 +538,7 @@ "more_replies": "更多回复" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 1dd21d2d8438acd51267e32542b8786023b64925 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:45 +0200 Subject: [PATCH 485/505] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index 8e51f391c9..872e58c788 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -538,6 +538,7 @@ "more_replies": "mais respostas" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From c048b87d517f4d5a9d288980e294f122ee039764 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:47 +0200 Subject: [PATCH 486/505] New translations en-US.json (Ukrainian) --- src/config/locales/uk-UA.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/uk-UA.json b/src/config/locales/uk-UA.json index e890fbf59f..1723a77fc1 100644 --- a/src/config/locales/uk-UA.json +++ b/src/config/locales/uk-UA.json @@ -538,6 +538,7 @@ "more_replies": "більше відповідей" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From a27219d7b6525d45b37ac7d5a7480630dcfb24d0 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:49 +0200 Subject: [PATCH 487/505] New translations en-US.json (Turkish) --- src/config/locales/tr-TR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/tr-TR.json b/src/config/locales/tr-TR.json index 4487b6f101..0149862000 100644 --- a/src/config/locales/tr-TR.json +++ b/src/config/locales/tr-TR.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 2c20f678ee6d47ae401665c07df9aa94969f8ac6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:51 +0200 Subject: [PATCH 488/505] New translations en-US.json (Swedish) --- src/config/locales/sv-SE.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sv-SE.json b/src/config/locales/sv-SE.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/sv-SE.json +++ b/src/config/locales/sv-SE.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From f48371e15050e34815143502a605fa8fe14597a8 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:53 +0200 Subject: [PATCH 489/505] New translations en-US.json (Albanian) --- src/config/locales/sq-AL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sq-AL.json b/src/config/locales/sq-AL.json index 6a6774d637..a951761bf4 100644 --- a/src/config/locales/sq-AL.json +++ b/src/config/locales/sq-AL.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From d11368ef24c947f3cddd27e0e1d5a0f3d19a611a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:55 +0200 Subject: [PATCH 490/505] New translations en-US.json (Slovenian) --- src/config/locales/sl-SI.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sl-SI.json b/src/config/locales/sl-SI.json index 2f375dcd0a..46cadc6253 100644 --- a/src/config/locales/sl-SI.json +++ b/src/config/locales/sl-SI.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From e805c4e7a529cc42d00d33a234ede6c66708948a Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:57 +0200 Subject: [PATCH 491/505] New translations en-US.json (Slovak) --- src/config/locales/sk-SK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/sk-SK.json b/src/config/locales/sk-SK.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/sk-SK.json +++ b/src/config/locales/sk-SK.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 0c56d343e5d5859e94ddfd93deb9cfbe1f303248 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:53:59 +0200 Subject: [PATCH 492/505] New translations en-US.json (Russian) --- src/config/locales/ru-RU.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ru-RU.json b/src/config/locales/ru-RU.json index 1ceb563ca0..8b8d03f14b 100644 --- a/src/config/locales/ru-RU.json +++ b/src/config/locales/ru-RU.json @@ -538,6 +538,7 @@ "more_replies": "больше ответов" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 9ad039d3e309b43464fcdb5cc896c6fc0b8b9755 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:54:01 +0200 Subject: [PATCH 493/505] New translations en-US.json (Polish) --- src/config/locales/pl-PL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/pl-PL.json b/src/config/locales/pl-PL.json index 495d40cb98..8a3368186a 100644 --- a/src/config/locales/pl-PL.json +++ b/src/config/locales/pl-PL.json @@ -538,6 +538,7 @@ "more_replies": "więcej odpowiedzi" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 53a0ccecfe6a503db7ffcfabde38c753c0c8bec2 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:54:03 +0200 Subject: [PATCH 494/505] New translations en-US.json (Korean) --- src/config/locales/ko-KR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ko-KR.json b/src/config/locales/ko-KR.json index 2d7d963e04..e556f255b8 100644 --- a/src/config/locales/ko-KR.json +++ b/src/config/locales/ko-KR.json @@ -538,6 +538,7 @@ "more_replies": "개의 대댓글" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 062a54837d337ae8024eb0f4fa83e8c040f37f7c Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:54:05 +0200 Subject: [PATCH 495/505] New translations en-US.json (Punjabi) --- src/config/locales/pa-IN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/pa-IN.json b/src/config/locales/pa-IN.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/pa-IN.json +++ b/src/config/locales/pa-IN.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 34bfa1a6585a3693dc3e7d0a9d6ccdf74fbe46a6 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:54:07 +0200 Subject: [PATCH 496/505] New translations en-US.json (Norwegian) --- src/config/locales/no-NO.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/no-NO.json b/src/config/locales/no-NO.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/no-NO.json +++ b/src/config/locales/no-NO.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 810daaf43202fe388dfe2453431ed4dd0c57f1dc Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:54:09 +0200 Subject: [PATCH 497/505] New translations en-US.json (Dutch) --- src/config/locales/nl-NL.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/nl-NL.json b/src/config/locales/nl-NL.json index ca77c4a494..0f0335a326 100644 --- a/src/config/locales/nl-NL.json +++ b/src/config/locales/nl-NL.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From c229e39076d4431e90a70448f5516d3c5fa8e105 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:54:11 +0200 Subject: [PATCH 498/505] New translations en-US.json (Mongolian) --- src/config/locales/mn-MN.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/mn-MN.json b/src/config/locales/mn-MN.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/mn-MN.json +++ b/src/config/locales/mn-MN.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 04e84cfe56067fe48d18f3cc37d65e80f9be9dc3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:54:13 +0200 Subject: [PATCH 499/505] New translations en-US.json (Macedonian) --- src/config/locales/mk-MK.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/mk-MK.json b/src/config/locales/mk-MK.json index e1651e8d7b..9d397c23e2 100644 --- a/src/config/locales/mk-MK.json +++ b/src/config/locales/mk-MK.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From e7e1ef4561b79d19a95634b3fe47e0c1aab482e4 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:54:15 +0200 Subject: [PATCH 500/505] New translations en-US.json (Lithuanian) --- src/config/locales/lt-LT.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/lt-LT.json b/src/config/locales/lt-LT.json index fb55e0ea7b..615158e974 100644 --- a/src/config/locales/lt-LT.json +++ b/src/config/locales/lt-LT.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From c0e9976ad43a1f965724202560ba607a59ac49b3 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:54:17 +0200 Subject: [PATCH 501/505] New translations en-US.json (Kurdish) --- src/config/locales/ku-TR.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/ku-TR.json b/src/config/locales/ku-TR.json index b86c0ffbf4..bfa9863df8 100644 --- a/src/config/locales/ku-TR.json +++ b/src/config/locales/ku-TR.json @@ -538,6 +538,7 @@ "more_replies": "bersivên zêdetir" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 937ddbc400fa08aa152668ecb11aa28bade7d168 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 11:54:19 +0200 Subject: [PATCH 502/505] New translations en-US.json (Spanish, Mexico) --- src/config/locales/es-MX.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/es-MX.json b/src/config/locales/es-MX.json index a101ec578c..fa301490e7 100644 --- a/src/config/locales/es-MX.json +++ b/src/config/locales/es-MX.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 151e33b83e504a9e1c5a9ef5f83aae8bfdb952b9 Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 12:09:27 +0200 Subject: [PATCH 503/505] Update source file en-US.json --- src/config/locales/en-US.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json index a101ec578c..fa301490e7 100644 --- a/src/config/locales/en-US.json +++ b/src/config/locales/en-US.json @@ -538,6 +538,7 @@ "more_replies": "more replies" }, "search_result": { + "others": "Others", "best": { "title": "Best" }, From 561f88dc36fb3c699e66f4b7fcc1dcb95dde460e Mon Sep 17 00:00:00 2001 From: Feruz M Date: Thu, 7 Jan 2021 12:09:33 +0200 Subject: [PATCH 504/505] New translations en-US.json (Portuguese) --- src/config/locales/pt-PT.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/locales/pt-PT.json b/src/config/locales/pt-PT.json index 872e58c788..97394b8809 100644 --- a/src/config/locales/pt-PT.json +++ b/src/config/locales/pt-PT.json @@ -362,7 +362,7 @@ "something_wrong": "Algo correu mal.", "something_wrong_alt": "Tente em https://ecency.com", "something_wrong_reload": "Recarregar", - "can_not_be_empty": "Title and body can not be empty!" + "can_not_be_empty": "Título e corpo não podem estar vazios!" }, "post": { "reblog_alert": "Tem certeza de que deseja reblogar?", @@ -538,15 +538,15 @@ "more_replies": "mais respostas" }, "search_result": { - "others": "Others", + "others": "Outros", "best": { - "title": "Best" + "title": "Melhores" }, "people": { - "title": "People" + "title": "Pessoas" }, "topics": { - "title": "Topics" + "title": "Tópicos" }, "communities": { "title": "Communities", From a237efc3f14b918be8b7c7d650edb9d82b790c27 Mon Sep 17 00:00:00 2001 From: feruzm Date: Thu, 7 Jan 2021 15:20:34 +0200 Subject: [PATCH 505/505] improve tag --- .../basicUIElements/view/tag/tagContainer.js | 36 ++++++++++--------- .../basicUIElements/view/tag/tagView.js | 2 +- src/providers/hive/dhive.js | 10 ++++-- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/src/components/basicUIElements/view/tag/tagContainer.js b/src/components/basicUIElements/view/tag/tagContainer.js index 3782d2d0d9..ddc6fb5199 100644 --- a/src/components/basicUIElements/view/tag/tagContainer.js +++ b/src/components/basicUIElements/view/tag/tagContainer.js @@ -34,22 +34,26 @@ const TagContainer = ({ useEffect(() => { let isCancelled = false; - getCommunityTitle(value) - .then((r) => { - if (!isCancelled) { - setLabel(r); - setIsCommunity(value !== r); - return r; - } - }) - .catch((e) => { - if (!isCancelled) { - setLabel(value); - setIsCommunity(/^hive-\d+/.test(value)); - return value; - } - }); - + if (value && /^hive-\d+/.test(value)) { + getCommunityTitle(value) + .then((r) => { + if (!isCancelled) { + setLabel(r); + setIsCommunity(value !== r); + return r; + } + }) + .catch((e) => { + if (!isCancelled) { + setLabel(value); + setIsCommunity(/^hive-\d+/.test(value)); + return value; + } + }); + } else { + setLabel(value); + setIsCommunity(false); + } return () => { isCancelled = true; }; diff --git a/src/components/basicUIElements/view/tag/tagView.js b/src/components/basicUIElements/view/tag/tagView.js index fa2b82d8e1..35e43a2b67 100644 --- a/src/components/basicUIElements/view/tag/tagView.js +++ b/src/components/basicUIElements/view/tag/tagView.js @@ -35,7 +35,7 @@ const Tag = ({ textStyle, ]} > - {isPostCardTag ? label : value} + {label} diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js index 7639c6f5ef..df187e9698 100644 --- a/src/providers/hive/dhive.js +++ b/src/providers/hive/dhive.js @@ -249,7 +249,7 @@ export const getUser = async (user, loggedIn = true) => { const cache = {}; const patt = /hive-\d\w+/g; -export const getCommunity = (tag, observer = '') => +export const getCommunity = async (tag, observer = '') => new Promise(async (resolve, reject) => { try { const community = await client.call('bridge', 'get_community', { @@ -294,7 +294,13 @@ export const getCommunityTitle = async (tag) => resolve(tag); }); -export const getCommunities = (last = '', limit = 100, query = '', sort = 'rank', observer = '') => +export const getCommunities = async ( + last = '', + limit = 100, + query = '', + sort = 'rank', + observer = '', +) => new Promise(async (resolve, reject) => { try { const data = await client.call('bridge', 'list_communities', {