diff --git a/public/app/core/components/code_editor/code_editor.ts b/public/app/core/components/code_editor/code_editor.ts
index 50ff55f3083..a2e45d70074 100644
--- a/public/app/core/components/code_editor/code_editor.ts
+++ b/public/app/core/components/code_editor/code_editor.ts
@@ -50,7 +50,7 @@ const DEFAULT_THEME_LIGHT = 'ace/theme/textmate';
const DEFAULT_MODE = 'text';
const DEFAULT_MAX_LINES = 10;
const DEFAULT_TAB_SIZE = 2;
-const DEFAULT_BEHAVIOURS = true;
+const DEFAULT_BEHAVIORS = true;
const DEFAULT_SNIPPETS = true;
const editorTemplate = `
`;
@@ -61,7 +61,7 @@ function link(scope, elem, attrs) {
const maxLines = attrs.maxLines || DEFAULT_MAX_LINES;
const showGutter = attrs.showGutter !== undefined;
const tabSize = attrs.tabSize || DEFAULT_TAB_SIZE;
- const behavioursEnabled = attrs.behavioursEnabled ? attrs.behavioursEnabled === 'true' : DEFAULT_BEHAVIOURS;
+ const behavioursEnabled = attrs.behavioursEnabled ? attrs.behavioursEnabled === 'true' : DEFAULT_BEHAVIORS;
const snippetsEnabled = attrs.snippetsEnabled ? attrs.snippetsEnabled === 'true' : DEFAULT_SNIPPETS;
// Initialize editor
diff --git a/public/app/core/components/json_explorer/helpers.ts b/public/app/core/components/json_explorer/helpers.ts
index c039d818281..65e7502a810 100644
--- a/public/app/core/components/json_explorer/helpers.ts
+++ b/public/app/core/components/json_explorer/helpers.ts
@@ -1,5 +1,5 @@
// Based on work https://github.com/mohsen1/json-formatter-js
-// Licence MIT, Copyright (c) 2015 Mohsen Azimi
+// License MIT, Copyright (c) 2015 Mohsen Azimi
/*
* Escapes `"` characters from string
diff --git a/public/app/core/components/json_explorer/json_explorer.ts b/public/app/core/components/json_explorer/json_explorer.ts
index 9a344d3195b..228154f9884 100644
--- a/public/app/core/components/json_explorer/json_explorer.ts
+++ b/public/app/core/components/json_explorer/json_explorer.ts
@@ -1,5 +1,5 @@
// Based on work https://github.com/mohsen1/json-formatter-js
-// Licence MIT, Copyright (c) 2015 Mohsen Azimi
+// License MIT, Copyright (c) 2015 Mohsen Azimi
import { isObject, getObjectName, getType, getValuePreview, cssClass, createElement } from './helpers';
diff --git a/public/app/core/components/sidemenu/BottomNavLinks.test.tsx b/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
index 8eaed4ca264..b52e5311dc5 100644
--- a/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
+++ b/public/app/core/components/sidemenu/BottomNavLinks.test.tsx
@@ -36,7 +36,7 @@ describe('Render', () => {
expect(wrapper).toMatchSnapshot();
});
- it('should render organisation switcher', () => {
+ it('should render organization switcher', () => {
const wrapper = setup({
link: {
showOrgSwitcher: true,
diff --git a/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap b/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
index f3181b617ad..ae8c9c753aa 100644
--- a/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
+++ b/public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
@@ -73,7 +73,7 @@ exports[`Render should render component 1`] = `
`;
-exports[`Render should render organisation switcher 1`] = `
+exports[`Render should render organization switcher 1`] = `
diff --git a/public/app/core/services/backend_srv.ts b/public/app/core/services/backend_srv.ts
index 144567efeb9..854169ad4b0 100644
--- a/public/app/core/services/backend_srv.ts
+++ b/public/app/core/services/backend_srv.ts
@@ -5,7 +5,7 @@ import { DashboardModel } from 'app/features/dashboard/dashboard_model';
export class BackendSrv {
private inFlightRequests = {};
- private HTTP_REQUEST_CANCELLED = -1;
+ private HTTP_REQUEST_CANCELED = -1;
private noBackendCache: boolean;
/** @ngInject */
@@ -178,7 +178,7 @@ export class BackendSrv {
return response;
})
.catch(err => {
- if (err.status === this.HTTP_REQUEST_CANCELLED) {
+ if (err.status === this.HTTP_REQUEST_CANCELED) {
throw { err, cancelled: true };
}
diff --git a/public/app/core/services/timer.ts b/public/app/core/services/timer.ts
index 8052b3f2e2c..8234b6288d4 100644
--- a/public/app/core/services/timer.ts
+++ b/public/app/core/services/timer.ts
@@ -2,7 +2,7 @@ import _ from 'lodash';
import coreModule from 'app/core/core_module';
// This service really just tracks a list of $timeout promises to give us a
-// method for cancelling them all when we need to
+// method for canceling them all when we need to
export class Timer {
timers = [];
diff --git a/public/app/core/table_model.ts b/public/app/core/table_model.ts
index 91a7cd0c1fb..20f165e4fee 100644
--- a/public/app/core/table_model.ts
+++ b/public/app/core/table_model.ts
@@ -40,7 +40,7 @@ export default class TableModel {
this.rows.sort((a, b) => {
a = a[options.col];
b = b[options.col];
- // Sort null or undefined seperately from comparable values
+ // Sort null or undefined separately from comparable values
return +(a == null) - +(b == null) || +(a > b) || -(a < b);
});
diff --git a/public/app/core/utils/kbn.ts b/public/app/core/utils/kbn.ts
index e0b98cb803c..81e37d55666 100644
--- a/public/app/core/utils/kbn.ts
+++ b/public/app/core/utils/kbn.ts
@@ -1084,7 +1084,7 @@ kbn.getUnitFormats = () => {
{ text: 'Watt (W)', value: 'watt' },
{ text: 'Kilowatt (kW)', value: 'kwatt' },
{ text: 'Milliwatt (mW)', value: 'mwatt' },
- { text: 'Watt per square metre (W/m²)', value: 'Wm2' },
+ { text: 'Watt per square meter (W/m²)', value: 'Wm2' },
{ text: 'Volt-ampere (VA)', value: 'voltamp' },
{ text: 'Kilovolt-ampere (kVA)', value: 'kvoltamp' },
{ text: 'Volt-ampere reactive (var)', value: 'voltampreact' },
@@ -1181,14 +1181,14 @@ kbn.getUnitFormats = () => {
submenu: [
{ text: 'parts-per-million (ppm)', value: 'ppm' },
{ text: 'parts-per-billion (ppb)', value: 'conppb' },
- { text: 'nanogram per cubic metre (ng/m³)', value: 'conngm3' },
- { text: 'nanogram per normal cubic metre (ng/Nm³)', value: 'conngNm3' },
- { text: 'microgram per cubic metre (μg/m³)', value: 'conμgm3' },
- { text: 'microgram per normal cubic metre (μg/Nm³)', value: 'conμgNm3' },
- { text: 'milligram per cubic metre (mg/m³)', value: 'conmgm3' },
- { text: 'milligram per normal cubic metre (mg/Nm³)', value: 'conmgNm3' },
- { text: 'gram per cubic metre (g/m³)', value: 'congm3' },
- { text: 'gram per normal cubic metre (g/Nm³)', value: 'congNm3' },
+ { text: 'nanogram per cubic meter (ng/m³)', value: 'conngm3' },
+ { text: 'nanogram per normal cubic meter (ng/Nm³)', value: 'conngNm3' },
+ { text: 'microgram per cubic meter (μg/m³)', value: 'conμgm3' },
+ { text: 'microgram per normal cubic meter (μg/Nm³)', value: 'conμgNm3' },
+ { text: 'milligram per cubic meter (mg/m³)', value: 'conmgm3' },
+ { text: 'milligram per normal cubic meter (mg/Nm³)', value: 'conmgNm3' },
+ { text: 'gram per cubic meter (g/m³)', value: 'congm3' },
+ { text: 'gram per normal cubic meter (g/Nm³)', value: 'congNm3' },
],
},
];