Skip to content
Merged
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
3 changes: 2 additions & 1 deletion client/modules/IDE/components/Editor/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,8 @@ Editor.propTypes = {
linewrap: PropTypes.bool.isRequired,
lintMessages: PropTypes.arrayOf(
PropTypes.shape({
severity: PropTypes.string.isRequired,
severity: PropTypes.oneOf(['error', 'hint', 'info', 'warning'])
.isRequired,
line: PropTypes.number.isRequired,
message: PropTypes.string.isRequired,
id: PropTypes.number.isRequired
Expand Down
3 changes: 2 additions & 1 deletion client/modules/IDE/components/EditorAccessibility.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ const EditorAccessibility = ({ lintMessages = [] }) => {
EditorAccessibility.propTypes = {
lintMessages: PropTypes.arrayOf(
PropTypes.shape({
severity: PropTypes.string.isRequired,
severity: PropTypes.oneOf(['error', 'hint', 'info', 'warning'])
.isRequired,
line: PropTypes.number.isRequired,
message: PropTypes.string.isRequired,
id: PropTypes.number.isRequired
Expand Down
40 changes: 40 additions & 0 deletions client/modules/IDE/components/EditorAccessibility.unit.test.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import React from 'react';

import { render, screen } from '../../../test-utils';

import EditorAccessibility from './EditorAccessibility';

describe('<EditorAccessibility />', () => {
it('renders empty message with no lines', () => {
render(<EditorAccessibility lintMessages={[]} />);

expect(
screen.getByRole('listitem', {
description: 'There are no lint messages'
})
).toBeInTheDocument();
});

it('renders lint message', () => {
render(
<EditorAccessibility
lintMessages={[
{
severity: 'info',
line: '1',
message: 'foo',
id: '1a2b3c'
}
]}
/>
);

expect(
screen.queryByText('There are no lint messages')
).not.toBeInTheDocument();

const listItem = screen.getByRole('listitem');
expect(listItem).toBeInTheDocument();
expect(listItem.textContent).toEqual('info in line1 :foo');
});
});
4 changes: 2 additions & 2 deletions translations/locales/de/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -530,8 +530,8 @@
"KeyUpLineNumber": "Zeile {{lineNumber}}"
},
"EditorAccessibility": {
"NoLintMessages": "Keine Lint-Warnungen vorhanden ",
"CurrentLine": " Aktuelle Zeile"
"NoLintMessages": "Keine Lint-Warnungen vorhanden",
"CurrentLine": "Aktuelle Zeile"
},
"Timer": {
"SavedAgo": "Gesichert: {{timeAgo}}"
Expand Down
4 changes: 2 additions & 2 deletions translations/locales/en-US/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,8 @@
"KeyUpLineNumber": "line {{lineNumber}}"
},
"EditorAccessibility": {
"NoLintMessages": "There are no lint messages ",
"CurrentLine": " Current line"
"NoLintMessages": "There are no lint messages",
"CurrentLine": "Current line"
},
"Timer": {
"SavedAgo": "Saved: {{timeAgo}}"
Expand Down
2 changes: 1 addition & 1 deletion translations/locales/es-419/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@
},
"EditorAccessibility": {
"NoLintMessages": "No hay mensajes de Lint",
"CurrentLine": " Línea actual"
"CurrentLine": "Línea actual"
},
"Timer": {
"SavedAgo": "Guardado: {{timeAgo}}"
Expand Down
4 changes: 2 additions & 2 deletions translations/locales/fr-CA/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,8 @@
"KeyUpLineNumber": "ligne {{lineNumber}}"
},
"EditorAccessibility": {
"NoLintMessages": "Il n'y a pas de messages lint ",
"CurrentLine": " Ligne actuelle"
"NoLintMessages": "Il n'y a pas de messages lint",
"CurrentLine": "Ligne actuelle"
},
"Timer": {
"SavedAgo": "Sauvegardé: {{timeAgo}}"
Expand Down
4 changes: 2 additions & 2 deletions translations/locales/hi/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,8 @@
"KeyUpLineNumber": "लाइन {{lineNumber}}"
},
"EditorAccessibility": {
"NoLintMessages": "कोई लिंट मैसेज नहीं ",
"CurrentLine": " वर्तमान लाइन"
"NoLintMessages": "कोई लिंट मैसेज नहीं",
"CurrentLine": "वर्तमान लाइन"
},
"Timer": {
"SavedAgo": "सेव किया: {{timeAgo}}"
Expand Down
4 changes: 2 additions & 2 deletions translations/locales/it/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,8 @@
"KeyUpLineNumber": "linea {{lineNumber}}"
},
"EditorAccessibility": {
"NoLintMessages": "Non ci sono messaggi ",
"CurrentLine": " Linea attuale"
"NoLintMessages": "Non ci sono messaggi",
"CurrentLine": "Linea attuale"
},
"Timer": {
"SavedAgo": "Salvato: {{timeAgo}}"
Expand Down
4 changes: 2 additions & 2 deletions translations/locales/ja/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -529,8 +529,8 @@
"KeyUpLineNumber": "{{lineNumber}} 行"
},
"EditorAccessibility": {
"NoLintMessages": "リントメッセージはありません ",
"CurrentLine": " 現在の行"
"NoLintMessages": "リントメッセージはありません",
"CurrentLine": "現在の行"
},
"Timer": {
"SavedAgo": "保存されました: {{timeAgo}}"
Expand Down
4 changes: 2 additions & 2 deletions translations/locales/ko/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -517,8 +517,8 @@
"KeyUpLineNumber": "line {{lineNumber}}"
},
"EditorAccessibility": {
"NoLintMessages": "There are no lint messages ",
"CurrentLine": " Current line"
"NoLintMessages": "There are no lint messages",
"CurrentLine": "Current line"
},
"Timer": {
"SavedAgo": "Saved: {{timeAgo}}"
Expand Down
2 changes: 1 addition & 1 deletion translations/locales/pt-BR/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@
"KeyUpLineNumber": "linha {{lineNumber}}"
},
"EditorAccessibility": {
"NoLintMessages": "Não há mensagens de Lint ",
"NoLintMessages": "Não há mensagens de Lint",
"CurrentLine": "Linha atual"
},
"Timer": {
Expand Down
4 changes: 2 additions & 2 deletions translations/locales/sv/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,8 @@
"KeyUpLineNumber": "rad {{lineNumber}}"
},
"EditorAccessibility": {
"NoLintMessages": "Det finns inga Lint-meddelanden ",
"CurrentLine": " Aktuell rad"
"NoLintMessages": "Det finns inga Lint-meddelanden",
"CurrentLine": "Aktuell rad"
},
"Timer": {
"SavedAgo": "Sparad: {{timeAgo}}"
Expand Down
4 changes: 2 additions & 2 deletions translations/locales/tr/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,8 @@
"KeyUpLineNumber": "{{lineNumber}}. satır"
},
"EditorAccessibility": {
"NoLintMessages": "Lint mesajı yok ",
"CurrentLine": " Şu anki satır"
"NoLintMessages": "Lint mesajı yok",
"CurrentLine": "Şu anki satır"
},
"Timer": {
"SavedAgo": "Kaydedildi: {{timeAgo}}"
Expand Down
4 changes: 2 additions & 2 deletions translations/locales/uk-UA/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -531,8 +531,8 @@
"KeyUpLineNumber": "рядок {{lineNumber}}"
},
"EditorAccessibility": {
"NoLintMessages": "Жодних повідомлень ",
"CurrentLine": " Поточний рядок"
"NoLintMessages": "Жодних повідомлень",
"CurrentLine": "Поточний рядок"
},
"Timer": {
"SavedAgo": "Збережено: {{timeAgo}}"
Expand Down
4 changes: 2 additions & 2 deletions translations/locales/zh-TW/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -532,8 +532,8 @@
"KeyUpLineNumber": "第 {{lineNumber}} 行"
},
"EditorAccessibility": {
"NoLintMessages": "沒有語法檢查的錯誤 ",
"CurrentLine": " 目前行"
"NoLintMessages": "沒有語法檢查的錯誤",
"CurrentLine": "目前行"
},
"Timer": {
"SavedAgo": "已儲存: {{timeAgo}}"
Expand Down