Merge branch 'jryans/font-text' into 'element'

Fix font input branding

See merge request new-vector/element/element-web/matrix-react-sdk!14

src/components/views/elements/AddressTile.js

@@ -58,18 +58,6 @@ export default createReactClass({
             imgUrls.push(require("../../../../res/img/icon-email-user.svg"));
         }
 
-        // Removing networks for now as they're not really supported
-        /*
-        var network;
-        if (this.props.networkUrl !== "") {
-            network = (
-                <div className="mx_AddressTile_network">
-                    <BaseAvatar width={25} height={25} name={this.props.networkName} title="Riot" url={this.props.networkUrl} />
-                </div>
-            );
-        }
-        */
-
         const BaseAvatar = sdk.getComponent('avatars.BaseAvatar');
         const TintableSvg = sdk.getComponent("elements.TintableSvg");
 

src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx

@@ -385,6 +385,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
     };
 
     private renderAdvancedSection() {
+        const brand = SdkConfig.get().brand;
         const toggle = <div
             className="mx_AppearanceUserSettingsTab_AdvancedToggle"
             onClick={() => this.setState({showAdvanced: !this.state.showAdvanced})}
@@ -395,6 +396,10 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
         let advanced: React.ReactNode;
 
         if (this.state.showAdvanced) {
+            const tooltipContent = _t(
+                "Set the name of a font installed on your system & %(brand)s will attempt to use it.",
+                { brand },
+            );
             advanced = <>
                 <SettingsFlag
                     name="useCompactLayout"
@@ -424,7 +429,7 @@ export default class AppearanceUserSettingsTab extends React.Component<IProps, I
 
                         SettingsStore.setValue("systemFont", null, SettingLevel.DEVICE, value.target.value);
                     }}
-                    tooltipContent="Set the name of a font installed on your system & Riot will attempt to use it."
+                    tooltipContent={tooltipContent}
                     forceTooltipVisible={true}
                     disabled={!this.state.useSystemFont}
                     value={this.state.systemFont}

src/i18n/strings/en_EN.json

@@ -850,6 +850,7 @@
     "Message layout": "Message layout",
     "Compact": "Compact",
     "Modern": "Modern",
+    "Set the name of a font installed on your system & %(brand)s will attempt to use it.": "Set the name of a font installed on your system & %(brand)s will attempt to use it.",
     "Customise your appearance": "Customise your appearance",
     "Appearance Settings only affect this %(brand)s session.": "Appearance Settings only affect this %(brand)s session.",
     "Flair": "Flair",