From 95bff5b2fe105c1c66646866a545028c109fb396 Mon Sep 17 00:00:00 2001 From: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 28 Apr 2024 14:39:27 +0000 Subject: [PATCH 01/10] chore: bump manifest version to nightly 3.14.4-beta.1 --- fxmanifest.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index dbd24c73b..8f1739848 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version("cerulean") game("gta5") description("js runtime monkaW") authors({ "itschip", "erik-sn", "TasoOneAsia", "kidz", "RockySouthpaw", "SamShanks", "c-wide", "mojito" }) -version("3.14.4-beta.0") +version("3.14.4-beta.1") client_scripts({ "dist/game/client/client.js", "dist/game/client/*.lua", From e670472c7f92a78c7e4a3bbbfbf836a1391f3ee8 Mon Sep 17 00:00:00 2001 From: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 28 Apr 2024 15:04:52 +0000 Subject: [PATCH 02/10] chore: bump manifest version to 3.15.0 --- fxmanifest.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index 8f1739848..bea6b1bc3 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version("cerulean") game("gta5") description("js runtime monkaW") authors({ "itschip", "erik-sn", "TasoOneAsia", "kidz", "RockySouthpaw", "SamShanks", "c-wide", "mojito" }) -version("3.14.4-beta.1") +version("3.15.0") client_scripts({ "dist/game/client/client.js", "dist/game/client/*.lua", From 65e1f8c898445e3b573262f05d40ba22264d0fd7 Mon Sep 17 00:00:00 2001 From: itschip Date: Wed, 1 May 2024 18:21:39 +0200 Subject: [PATCH 03/10] fix(apps/phone): disabling apps --- apps/phone/src/os/apps/hooks/useApps.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/phone/src/os/apps/hooks/useApps.tsx b/apps/phone/src/os/apps/hooks/useApps.tsx index 95b4fc610..e3e96b20b 100644 --- a/apps/phone/src/os/apps/hooks/useApps.tsx +++ b/apps/phone/src/os/apps/hooks/useApps.tsx @@ -6,11 +6,13 @@ import { SvgIconComponent } from '@mui/icons-material'; import { useTheme } from '@mui/material'; import { useSettingsValue } from '../../../apps/settings/hooks/useSettings'; import { IconSetObject } from '@typings/settings'; +import { usePhone } from '@os/phone/hooks'; export const useApps = () => { const { icons } = useNotifications(); const theme = useTheme(); const curIconSet = useSettingsValue().iconSet.value as IconSetObject; + const { ResourceConfig } = usePhone(); const apps: IApp[] = useMemo(() => { return APPS.map((app) => { @@ -38,7 +40,7 @@ export const useApps = () => { ), icon: , - isDisabled: app.disable, + isDisabled: !!ResourceConfig?.disabledApps.find((a) => a === app.id), }; } @@ -47,10 +49,10 @@ export const useApps = () => { notification: icons.find((i) => i.key === app.id), NotificationIcon, notificationIcon: , - isDisabled: app.disable, + isDisabled: !!ResourceConfig?.disabledApps.find((a) => a === app.id), }; }); - }, [icons, curIconSet, theme]); + }, [icons, curIconSet, theme, ResourceConfig]); const allApps = useMemo(() => [...apps], [apps]); const getApp = useCallback( From d4ee9fe3e0a0bb4fc41cfd0207bc1ea28098504f Mon Sep 17 00:00:00 2001 From: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 16:22:01 +0000 Subject: [PATCH 04/10] chore: bump manifest version to nightly 3.15.1-beta.0 --- fxmanifest.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index bea6b1bc3..38e379b56 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version("cerulean") game("gta5") description("js runtime monkaW") authors({ "itschip", "erik-sn", "TasoOneAsia", "kidz", "RockySouthpaw", "SamShanks", "c-wide", "mojito" }) -version("3.15.0") +version("3.15.1-beta.0") client_scripts({ "dist/game/client/client.js", "dist/game/client/*.lua", From 481b2046fdeeb41eb7c127fcda6b3ab01e649f98 Mon Sep 17 00:00:00 2001 From: Antony <97451137+TonybynMp4@users.noreply.github.com> Date: Thu, 23 May 2024 14:20:58 +0200 Subject: [PATCH 05/10] feat: complete french locale (#1152) * Update fr.json * add all missing locales --- apps/phone/src/locale/fr.json | 40 ++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/apps/phone/src/locale/fr.json b/apps/phone/src/locale/fr.json index 3258468b5..7a5ab1b83 100644 --- a/apps/phone/src/locale/fr.json +++ b/apps/phone/src/locale/fr.json @@ -48,6 +48,10 @@ "TITLE": "Mode streamer", "DESCRIPTION": "Masquer les images avant qu'elles ne soient montrées" }, + "ANONYMOUS_MODE": { + "TITLE": "Mode anonyme", + "DESCRIPTION": "Cache votre numéro de téléphone aux autres utilisateurs" + }, "CUSTOM_WALLPAPER": { "DIALOG_TITLE": "Fond d'écran personnalisé", "DIALOG_CONTENT": "Choisissez un fond d'écran personnalisé en collant l'URL de l'image en dessous!", @@ -102,7 +106,8 @@ "CURRENT_CALL_TITLE": "Appel en cours", "INCOMING_CALL_TITLE": "Appel entrant", "CURRENT_CALL_WITH": "En appel avec {{ transmitter }}", - "TRANSMITTER_IS_CALLING": "{{ transmitter }} vous appelle!" + "TRANSMITTER_IS_CALLING": "{{ transmitter }} vous appelle!", + "CALLING": "Appelle {{ transmitter }}..." }, "INPUT_PLACEHOLDER": "Entrer un numéro", "NAVBAR_HISTORY": "Historique", @@ -157,6 +162,7 @@ "MATCH": { "MESSAGES": { "PROFILE_MATCHED_AT": "Matché: {{ matchedAt }}", + "NEW_MATCH": "Nouveau match!", "PROFILE_LAST_ACTIVE": "Dernière activité: {{ lastActive }}", "LIKED": "LIKE", "NOPE": "NOPE" @@ -178,6 +184,7 @@ "EDIT_PROFILE_LOCATION": "Localisation", "EDIT_PROFILE_JOB": "Job", "EDIT_PROFILE_TAGS": "Tags", + "EDIT_VOICE_MESSAGE": "Message Vocal", "EDIT_PROFILE_PREVIEW": "Voir l'aperçu", "LIKE": "Like", "DISLIKE": "Dislike" @@ -235,19 +242,47 @@ "NEW_MESSAGE": "Message...", "NEW_MESSAGE_GROUP": "Numéros de téléphone...", "SHARE_IMAGE_TITLE": "Voulez-vous partager cette image?", + "SHARE_NOTE_TITLE": "Voulez-vous partager cette note?", "SHARE_CONTACT_TITLE": "Voulez-vous partager ce contact?", "GROUP_CHAT_LABEL": "Nom du groupe...", "MEDIA_OPTION": "Caméra / Galerie", "CONTACT_OPTION": "Partager contact", "CONTACT_SHARED": "Contact partagé", + "NOTE_OPTION": "Partager Note", "LOCATION_OPTION": "Partager localisation", "LOCATION_MESSAGE": "Localisation partagée", "LOCATION_TOOLTIP": "Définir point GPS", + "NOTE_TOOLTIP": "Voir Note", "NEW_MESSAGE_GROUP_SUBMIT": "Envoyer", "INPUT_NAME_OR_NUMBER": "Rechercher des contacts ou tapez un numéro et appuyez sur Entrée", "ACTIONS_TITLE": "Actions", "ME": "Moi" }, + "DARKCHAT": { + "FEEDBACK": { + "FETCH_MESSAGES_FAILED": "Échec: récupération des messages", + "JOIN_CHANNEL_FAILED": "Échec: rejoindre le channel", + "LEAVE_CHANNEL_FAILED": "Échec: quitter le channel", + "SEND_MESSAGE_FAILED": "Échec: envoyer le message", + "UPDATE_LABEL_FAILED": "Échec: mettre a jour le nom du channel", + "TRANSFER_OWNERSHIP_FAILED": "Échec: mettre a jour le propriétaire", + "FETCH_MEMBERS_FAILED": "Échec: récuperer les membres", + "DELETE_CHANNEL_FAILED": "Échec: suppression de la chaîne" + }, + "TYPE_TO_CONFIRM": "Ecrivez \"{{ identifier }}\" pour confirmer.", + "LEAVE": "Quitter", + "NEW_CHANNEL_TITLE": "Rejoindre channel avec l'ID", + "DELETE_CHANNEL_TITLE": "Supprimer channel", + "NEW_CHANNEL_INPUT_PLACEHOLDER": "ID Channel", + "JOIN_BUTTON": "Rejoindre channel", + "TRANSFER_OWNERSHIP": "Transferer propriétaire", + "MESSAGE_PLACEHOLDER": "Envoyer un message", + "MEDIA_PLACEHOLDER": "URL Image", + "MEDIA_UPLOAD": "Upload Image", + "MEDIA_GALLERY": "CHOISIR IMAGE", + "MEMBERS": "Membres", + "DANGER_ZONE": "Zone Dangereuse" + }, "RELATIVE_TIME": { "future": "dans %s", "past": "%s plus tôt", @@ -280,11 +315,13 @@ "CONTENT": "Contenu", "SHARE": "Partager", "ADD": "Ajouter", + "SEND": "Envoyer", "WRITE_TO_CLIPBOARD_TOOLTIP": "Copier {{ content }}", "WRITE_TO_CLIPBOARD_MESSAGE": "{{content}} copié dans le presse-papier!" }, "COMING_SOON": "Coming soon...", "INITIALIZING": "Initialisation", + "APPS_SYSTEM": "Système", "APPS_DIALER": "Téléphone", "APPS_CONTACTS": "Contacts", "APPS_MESSAGES": "Messages", @@ -298,6 +335,7 @@ "APPS_CAMERA": "Caméra", "APPS_MATCH": "Matchmaker", "APPS_CALCULATOR_COPIED": "Résultat copié dans le presse-papier!", + "APPS_DARKCHAT": "IRC", "GENERIC_CLICK_TO_REVEAL": "Cliquer pour révéler", "GENERIC_LOADING": "Chargement...", "GENERIC_WAIT": "Veuillez patienter...", From 43fea82c1f838ad5e5e258fa9184fe43ffba571c Mon Sep 17 00:00:00 2001 From: Manifest Bumper <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 23 May 2024 12:21:26 +0000 Subject: [PATCH 06/10] chore: bump manifest version to nightly 3.15.1-beta.1 --- fxmanifest.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fxmanifest.lua b/fxmanifest.lua index 38e379b56..f6f8b90d8 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -2,7 +2,7 @@ fx_version("cerulean") game("gta5") description("js runtime monkaW") authors({ "itschip", "erik-sn", "TasoOneAsia", "kidz", "RockySouthpaw", "SamShanks", "c-wide", "mojito" }) -version("3.15.1-beta.0") +version("3.15.1-beta.1") client_scripts({ "dist/game/client/client.js", "dist/game/client/*.lua", From 1d24ffe4ae4aa628022819e2a737fc1d57c887c5 Mon Sep 17 00:00:00 2001 From: Pan Pingwin <62256846+walkiz2136@users.noreply.github.com> Date: Thu, 20 Jun 2024 22:26:38 +0200 Subject: [PATCH 07/10] Update en.json --- apps/phone/src/locale/en.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/phone/src/locale/en.json b/apps/phone/src/locale/en.json index f390516e0..d9ad8ef77 100644 --- a/apps/phone/src/locale/en.json +++ b/apps/phone/src/locale/en.json @@ -154,6 +154,8 @@ "TWEET_MESSAGE_PLACEHOLDER": "What's happening?", "SEARCH_TWEETS_PLACEHOLDER": "Search by profile name or message", "SEARCH_TWEETS": "Search for posts", + "LOADING_TWEETS": "Loading tweets...", + "NOTHING_TO_LOAD": "Nothing more to load!", "TIME_JUST_NOW": "Just now", "TIME_MINUTES": "m", "TIME_HOURS": "h", From 2d299f2a5fbe49aa9a262298559577ddb6dda590 Mon Sep 17 00:00:00 2001 From: Pan Pingwin <62256846+walkiz2136@users.noreply.github.com> Date: Thu, 20 Jun 2024 22:27:25 +0200 Subject: [PATCH 08/10] Update pl.json --- apps/phone/src/locale/pl.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/phone/src/locale/pl.json b/apps/phone/src/locale/pl.json index edb788331..e682d89a4 100644 --- a/apps/phone/src/locale/pl.json +++ b/apps/phone/src/locale/pl.json @@ -81,6 +81,8 @@ "FAILED_TO_TAKE_PHOTO": "Zdjęcie nie mogło zostać zapisane" }, "CONTACTS": { + "MY_NUMBER": "Mój numer", + "NEARBY_SHARE": "Udostępnij pobliskim", "FEEDBACK": { "ADD_FAILED": "Nie udało się zapisać kontaktu!", "ADD_SUCCESS": "Kontakt został pomyślnie zapisany!", @@ -152,6 +154,8 @@ "TWEET_MESSAGE_PLACEHOLDER": "Co się dzieje?", "SEARCH_TWEETS_PLACEHOLDER": "Wyszukaj według nazwy profilu lub wiadomości", "SEARCH_TWEETS": "Wyszukiwanie postów", + "LOADING_TWEETS": "Wczytywanie...", + "NOTHING_TO_LOAD": "Brak wpisów do wczytania!", "TIME_JUST_NOW": "Przed chwilą", "TIME_MINUTES": "m", "TIME_HOURS": "g", From 4a3ef35c53d4145351f9fdff53889d3e3aa55204 Mon Sep 17 00:00:00 2001 From: Pan Pingwin <62256846+walkiz2136@users.noreply.github.com> Date: Thu, 20 Jun 2024 22:27:51 +0200 Subject: [PATCH 09/10] Update TweetList.tsx --- apps/phone/src/apps/twitter/components/tweet/TweetList.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/phone/src/apps/twitter/components/tweet/TweetList.tsx b/apps/phone/src/apps/twitter/components/tweet/TweetList.tsx index 41bc20b99..a541323ee 100644 --- a/apps/phone/src/apps/twitter/components/tweet/TweetList.tsx +++ b/apps/phone/src/apps/twitter/components/tweet/TweetList.tsx @@ -55,7 +55,7 @@ export function TweetList({ tweets }: { tweets: FormattedTweet[] }) {
- Loading Tweets... + {t('MESSAGES.NEW_MESSAGE_GROUP_SUBMIT')}
); } else { @@ -63,7 +63,7 @@ export function TweetList({ tweets }: { tweets: FormattedTweet[] }) {
- Nothing More To Load! + {t('MESSAGES.NEW_MESSAGE_GROUP_SUBMIT')}
); } From 71c5f60cc9f9726bb6787d1f2efe913193a36663 Mon Sep 17 00:00:00 2001 From: Pan Pingwin <62256846+walkiz2136@users.noreply.github.com> Date: Thu, 20 Jun 2024 22:30:52 +0200 Subject: [PATCH 10/10] Update TweetList.tsx --- apps/phone/src/apps/twitter/components/tweet/TweetList.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/phone/src/apps/twitter/components/tweet/TweetList.tsx b/apps/phone/src/apps/twitter/components/tweet/TweetList.tsx index a541323ee..cf2509a74 100644 --- a/apps/phone/src/apps/twitter/components/tweet/TweetList.tsx +++ b/apps/phone/src/apps/twitter/components/tweet/TweetList.tsx @@ -55,7 +55,7 @@ export function TweetList({ tweets }: { tweets: FormattedTweet[] }) {
- {t('MESSAGES.NEW_MESSAGE_GROUP_SUBMIT')} + {t('LOADING_TWEETS')}
); } else { @@ -63,7 +63,7 @@ export function TweetList({ tweets }: { tweets: FormattedTweet[] }) {
- {t('MESSAGES.NEW_MESSAGE_GROUP_SUBMIT')} + {t('NOTHING_TO_LOAD')}
); }