Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/phone/src/apps/twitter/components/tweet/TweetList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ export function TweetList({ tweets }: { tweets: FormattedTweet[] }) {
<div
style={{ padding: '2rem', display: 'flex', justifyContent: 'center', color: '#64A5FD' }}
>
Loading Tweets...
{t('LOADING_TWEETS')}
</div>
);
} else {
return (
<div
style={{ padding: '2rem', display: 'flex', justifyContent: 'center', color: '#64A5FD' }}
>
Nothing More To Load!
{t('NOTHING_TO_LOAD')}
</div>
);
}
Expand Down
2 changes: 2 additions & 0 deletions apps/phone/src/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
40 changes: 39 additions & 1 deletion apps/phone/src/locale/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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!",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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...",
Expand Down
4 changes: 4 additions & 0 deletions apps/phone/src/locale/pl.json
Original file line number Diff line number Diff line change
Expand Up @@ -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!",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 5 additions & 3 deletions apps/phone/src/os/apps/hooks/useApps.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -38,7 +40,7 @@ export const useApps = () => {
<NotificationIcon htmlColor={theme.palette.text.primary} fontSize="small" />
),
icon: <Icon />,
isDisabled: app.disable,
isDisabled: !!ResourceConfig?.disabledApps.find((a) => a === app.id),
};
}

Expand All @@ -47,10 +49,10 @@ export const useApps = () => {
notification: icons.find((i) => i.key === app.id),
NotificationIcon,
notificationIcon: <NotificationIcon htmlColor={app.color} fontSize="small" />,
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(
Expand Down
2 changes: 1 addition & 1 deletion fxmanifest.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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.15.1-beta.1")
client_scripts({
"dist/game/client/client.js",
"dist/game/client/*.lua",
Expand Down