imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into germain-gg/notifications-labs

Browse source
This commit is contained in:
RMidhunSuresh 2023-09-14 12:14:08 +05:30
commit 1ba419fe11
No known key found for this signature in database
155 changed files with 17952 additions and 15335 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/settings/Settings.tsx
View file

@ -99,18 +99,18 @@ export enum Features {
}
export const labGroupNames: Record<LabGroup, TranslationKey> = {
[LabGroup.Messaging]: _td("Messaging"),
[LabGroup.Profile]: _td("Profile"),
[LabGroup.Spaces]: _td("Spaces"),
[LabGroup.Widgets]: _td("Widgets"),
[LabGroup.Rooms]: _td("Rooms"),
[LabGroup.VoiceAndVideo]: _td("Voice & Video"),
[LabGroup.Moderation]: _td("Moderation"),
[LabGroup.Messaging]: _td("labs|group_messaging"),
[LabGroup.Profile]: _td("labs|group_profile"),
[LabGroup.Spaces]: _td("labs|group_spaces"),
[LabGroup.Widgets]: _td("labs|group_widgets"),
[LabGroup.Rooms]: _td("labs|group_rooms"),
[LabGroup.VoiceAndVideo]: _td("labs|group_voip"),
[LabGroup.Moderation]: _td("labs|group_moderation"),
[LabGroup.Analytics]: _td("common|analytics"),
[LabGroup.Themes]: _td("Themes"),
[LabGroup.Encryption]: _td("Encryption"),
[LabGroup.Experimental]: _td("Experimental"),
[LabGroup.Developer]: _td("Developer"),
[LabGroup.Themes]: _td("labs|group_themes"),
[LabGroup.Encryption]: _td("labs|group_encryption"),
[LabGroup.Experimental]: _td("labs|group_experimental"),
[LabGroup.Developer]: _td("labs|group_developer"),
};
export type SettingValueType =
@ -467,7 +467,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
controller: new RustCryptoSdkController(),
},
"baseFontSize": {
displayName: _td("Font size"),
displayName: _td("settings|appearance|font_size"),
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
default: "",
controller: new FontSizeController(),
@ -487,7 +487,7 @@ export const SETTINGS: { [setting: string]: ISetting } = {
*
*/
"baseFontSizeV2": {
displayName: _td("Font size"),
displayName: _td("settings|appearance|font_size"),
supportedLevels: [SettingLevel.DEVICE],
default: FontWatcher.DEFAULT_SIZE,
controller: new FontSizeController(),
@ -721,18 +721,18 @@ export const SETTINGS: { [setting: string]: ISetting } = {
"use_system_theme": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
default: true,
displayName: _td("Match system theme"),
displayName: _td("settings|appearance|match_system_theme"),
},
"useSystemFont": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
default: false,
displayName: _td("Use a system font"),
displayName: _td("settings|appearance|custom_font"),
controller: new UseSystemFontController(),
},
"systemFont": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
default: "",
displayName: _td("System font name"),
displayName: _td("settings|appearance|custom_font_name"),
controller: new SystemFontController(),
},
"webRtcAllowPeerToPeer": {