Skip to content

Commit

Permalink
Merge branch 'announcement-banner-force-migration' into 'master'
Browse files Browse the repository at this point in the history
Fix: Change color, text and icon of migration announcement banner

See merge request kchat/webapp!836
  • Loading branch information
antonbuks committed Jul 11, 2024
2 parents 33d1c3a + 6ddc54a commit 3af880c
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {AnnouncementBarTypes} from 'utils/constants';
import {isServerVersionGreaterThanOrEqualTo} from 'utils/server_version';
import * as UserAgent from 'utils/user_agent';

import informationIcon from 'images/icons/information-blue.svg';
import warningIcon from 'images/icons/warning-alert.svg';

import AnnouncementBar from '../default_announcement_bar';

Expand Down Expand Up @@ -43,7 +43,7 @@ export default class AppStoreBar extends React.PureComponent<Props> {
icon={
<img
className='version-alert-icon'
src={informationIcon}
src={warningIcon}
/>
}
message={
Expand All @@ -52,7 +52,7 @@ export default class AppStoreBar extends React.PureComponent<Props> {

<FormattedMessage
id='appstore.bar'
defaultMessage='A new version of the kChat app is available. Please'
defaultMessage='Your version of the app is no longer supported. Please'
/>
{/* eslint-disable-next-line @mattermost/use-external-link */}
<a
Expand All @@ -63,12 +63,12 @@ export default class AppStoreBar extends React.PureComponent<Props> {
>
<FormattedMessage
id='appstore.bar.update'
defaultMessage='update'
defaultMessage='install the new version'
/>
</a>
<FormattedMessage
id='appstore.bar.end'
defaultMessage=' from the App Store to benefit from the latest improvements'
defaultMessage=' before September 2nd to benefit from the latest improvements.'
/>
{'.'}
</div>
Expand Down
6 changes: 3 additions & 3 deletions webapp/channels/src/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -2840,9 +2840,9 @@
"apps.suggestion.no_dynamic": "Keine Daten bei dynamischen Vorschlägen geliefert",
"apps.suggestion.no_static": "Keine passenden Auswahlmöglichkeiten.",
"apps.suggestion.no_suggestion": "Keine passenden Vorschläge.",
"appstore.bar": "Eine neue Version der kChat-App ist verfügbar. Bitte",
"appstore.bar.end": " vom App Store, um von den neuesten Verbesserungen zu profitieren",
"appstore.bar.update": "aktualisieren",
"appstore.bar": "Ihre Version der App wird nicht mehr unterstützt. Bitte",
"appstore.bar.end": "vor dem 2. September, um von den neuesten Verbesserungen zu profitieren.",
"appstore.bar.update": "installieren Sie die neue Version",
"archivedChannelMessage": "Du siehst einen **archivierten Kanal**. Neue Nachrichten können nicht geschickt werden.",
"atmos/camo": "atmos/camo",
"audit_table.accountActive": "Konto aktiviert",
Expand Down
6 changes: 3 additions & 3 deletions webapp/channels/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2919,9 +2919,9 @@
"apps.suggestion.no_dynamic": "No data was returned for dynamic suggestions",
"apps.suggestion.no_static": "No matching options.",
"apps.suggestion.no_suggestion": "No matching suggestions.",
"appstore.bar": "A new version of the kChat app is available. Please",
"appstore.bar.end":" from the App Store to benefit from the latest improvements",
"appstore.bar.update": "update",
"appstore.bar": "Your version of the app is no longer supported. Please",
"appstore.bar.end": "before September 2nd to benefit from the latest improvements.",
"appstore.bar.update": "install the new version",
"archivedChannelMessage": "You are viewing an **archived channel**. New messages cannot be posted.",
"atmos/camo": "atmos/camo",
"audit_table.accountActive": "Account activated",
Expand Down
6 changes: 3 additions & 3 deletions webapp/channels/src/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -2602,9 +2602,9 @@
"apps.suggestion.no_dynamic": "No se han devuelto datos para las sugerencias dinámicas",
"apps.suggestion.no_static": "No hay opciones que coincidan.",
"apps.suggestion.no_suggestion": "No hay sugerencias que coincidan.",
"appstore.bar": "Una nueva versión de la aplicación kChat está disponible. Por favor",
"appstore.bar.end": " desde la App Store para beneficiarte de las últimas mejoras",
"appstore.bar.update": "actualizar",
"appstore.bar": "Su versión de la aplicación ya no es compatible. Por favor",
"appstore.bar.end": "antes del 2 de septiembre para beneficiarse de las últimas mejoras.",
"appstore.bar.update": "instalar la nueva versión",
"archivedChannelMessage": "Estás viendo un **canal archivado**. No serán publicados nuevos mensajes.",
"atmos/camo": "atmos/camo",
"audit_table.accountActive": "Cuenta activada",
Expand Down
6 changes: 3 additions & 3 deletions webapp/channels/src/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -2558,9 +2558,9 @@
"apps.suggestion.no_dynamic": "Aucune donnée n'a été renvoyée pour les suggestions dynamiques",
"apps.suggestion.no_static": "Aucune option correspondante.",
"apps.suggestion.no_suggestion": "Aucune suggestion correspondante.",
"appstore.bar": "Une nouvelle version de l'application kChat est disponible. Veuillez la",
"appstore.bar.end": " depuis l'App Store pour bénéficier des dernières améliorations",
"appstore.bar.update": "mettre à jour",
"appstore.bar": "Votre version de l'application n'est plus supportée. Veuillez",
"appstore.bar.end": " avant le 2 septembre pour bénéficier des dernières améliorations.",
"appstore.bar.update": "installer la nouvelle version",
"archivedChannelMessage": "Vous consultez un **canal archivé**. Vous ne pouvez pas publier de nouveaux messages.",
"atmos/camo": "atmos/camo",
"audit_table.accountActive": "Compte activé",
Expand Down
6 changes: 3 additions & 3 deletions webapp/channels/src/i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -1954,9 +1954,9 @@
"apps.suggestion.no_dynamic": "Non sono stati restituiti dati per i suggerimenti dinamici",
"apps.suggestion.no_static": "Nessuna opzione corrispondente.",
"apps.suggestion.no_suggestion": "Nessun suggerimento corrispondente.",
"appstore.bar": "Una nuova versione dell'app kChat è disponibile. Per favore",
"appstore.bar.end": " dall'App Store per beneficiare degli ultimi miglioramenti",
"appstore.bar.update": "aggiorna",
"appstore.bar": "La tua versione dell'app non è più supportata. Per favore",
"appstore.bar.end": "prima del 2 settembre per beneficiare degli ultimi miglioramenti.",
"appstore.bar.update": "installare la nuova versione",
"archivedChannelMessage": "Stai visualizzato un **canale archiviato**. Non si possono pubblicare nuovi messaggi.",
"atmos/camo": "atmos/camo",
"audit_table.accountActive": "Account attivato",
Expand Down
3 changes: 3 additions & 0 deletions webapp/channels/src/images/icons/warning-alert.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion webapp/channels/src/sass/components/_announcement-bar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
}

.announcement-bar-update-mac {
background-color: #F4F6FD;
background-color: #FFE7A5;
color: #333333;
}

Expand Down

0 comments on commit 3af880c

Please sign in to comment.