IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-misspell-issues' of https://github.com/mjtrangoni/grafana into mjtrangoni-fix-misspell-issues

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-12-19 11:21:34 +01:00
commit 6542bfb83e
20 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -90,7 +90,7 @@ Choose this option to build on platforms other than linux/amd64 and/or not have
The resulting image will be tagged as `grafana/grafana:dev`
Notice: If you are using Docker for MacOS, be sure to let limit of Memory bigger than 2 GiB (at docker -> Perferences -> Advanced), otherwize you may faild at `grunt build`
Notice: If you are using Docker for MacOS, be sure to let limit of Memory bigger than 2 GiB (at docker -> Preferences -> Advanced), otherwize you may faild at `grunt build`
### Dev config

4
public/app/core/components/code_editor/code_editor.ts
View File

@ -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 = `<div></div>`;
@ -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

2
public/app/core/components/json_explorer/helpers.ts
View File

@ -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

2
public/app/core/components/json_explorer/json_explorer.ts
View File

@ -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';

2
public/app/core/components/sidemenu/BottomNavLinks.test.tsx
View File

@ -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,

2
public/app/core/components/sidemenu/__snapshots__/BottomNavLinks.test.tsx.snap
View File

@ -73,7 +73,7 @@ exports[`Render should render component 1`] = `
</div>
`;
exports[`Render should render organisation switcher 1`] = `
exports[`Render should render organization switcher 1`] = `
<div
className="sidemenu-item dropdown dropup"
>

4
public/app/core/services/backend_srv.ts
View File

@ -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 };
}

2
public/app/core/services/timer.ts
View File

@ -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 = [];

2
public/app/core/table_model.ts
View File

@ -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);
});

18
public/app/core/utils/kbn.ts
View File

@ -1085,7 +1085,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' },
@ -1182,14 +1182,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' },
],
},
];

2
public/app/features/dashboard/state/actions.ts
View File

@ -67,7 +67,7 @@ export function updateDashboardPermission(
const updated = toUpdateItem(item);
// if this is the item we want to update, update it's permisssion
// if this is the item we want to update, update it's permission
if (itemToUpdate === item) {
updated.permission = level;
}

2
public/app/features/explore/Explore.tsx
View File

@ -482,7 +482,7 @@ export class Explore extends React.PureComponent<ExploreProps, ExploreState> {
} else {
// Modify query only at index
nextQueries = initialQueries.map((query, i) => {
// Synchronise all queries with local query cache to ensure consistency
// Synchronize all queries with local query cache to ensure consistency
// TODO still needed?
return i === index
? {

2
public/app/features/explore/PlaceholdersBuffer.ts
View File

@ -88,7 +88,7 @@ export default class PlaceholdersBuffer {
orders.push({ index: parts.length - 1, order });
textOffset += part.length + match.length;
}
// Ensures string serialisation still works if no placeholders were parsed
// Ensures string serialization still works if no placeholders were parsed
// and also accounts for the remainder of text with placeholders
parts.push(text.slice(textOffset));
return {

2
public/app/features/folders/state/actions.ts
View File

@ -112,7 +112,7 @@ export function updateFolderPermission(itemToUpdate: DashboardAcl, level: Permis
const updated = toUpdateItem(item);
// if this is the item we want to update, update it's permisssion
// if this is the item we want to update, update it's permission
if (itemToUpdate === item) {
updated.permission = level;
}

12
public/app/features/org/state/actions.ts
View File

@ -5,7 +5,7 @@ import { getBackendSrv } from 'app/core/services/backend_srv';
type ThunkResult<R> = ThunkAction<R, StoreState, undefined, any>;
export enum ActionTypes {
LoadOrganization = 'LOAD_ORGANISATION',
LoadOrganization = 'LOAD_ORGANIZATION',
SetOrganizationName = 'SET_ORGANIZATION_NAME',
}
@ -19,9 +19,9 @@ interface SetOrganizationNameAction {
payload: string;
}
const organisationLoaded = (organisation: Organization) => ({
const organizationLoaded = (organization: Organization) => ({
type: ActionTypes.LoadOrganization,
payload: organisation,
payload: organization,
});
export const setOrganizationName = (orgName: string) => ({
@ -33,10 +33,10 @@ export type Action = LoadOrganizationAction | SetOrganizationNameAction;
export function loadOrganization(): ThunkResult<void> {
return async dispatch => {
const organisationResponse = await getBackendSrv().get('/api/org');
dispatch(organisationLoaded(organisationResponse));
const organizationResponse = await getBackendSrv().get('/api/org');
dispatch(organizationLoaded(organizationResponse));
return organisationResponse;
return organizationResponse;
};
}

2
public/app/features/panel/metrics_panel_ctrl.ts
View File

@ -90,7 +90,7 @@ class MetricsPanelCtrl extends PanelCtrl {
.then(this.issueQueries.bind(this))
.then(this.handleQueryResult.bind(this))
.catch(err => {
// if cancelled keep loading set to true
// if canceled keep loading set to true
if (err.cancelled) {
console.log('Panel request cancelled', err);
return;

4
public/app/plugins/datasource/loki/result_transformer.test.ts
View File

@ -35,7 +35,7 @@ describe('getLoglevel()', () => {
});
describe('parseLabels()', () => {
it('returns no labels on emtpy labels string', () => {
it('returns no labels on empty labels string', () => {
expect(parseLabels('')).toEqual({});
expect(parseLabels('{}')).toEqual({});
});
@ -46,7 +46,7 @@ describe('parseLabels()', () => {
});
describe('formatLabels()', () => {
it('returns no labels on emtpy label set', () => {
it('returns no labels on empty label set', () => {
expect(formatLabels({})).toEqual('');
expect(formatLabels({}, 'foo')).toEqual('foo');
});

2
public/app/plugins/panel/graph/graph.ts
View File

@ -737,7 +737,7 @@ class GraphElement {
if (min && max && ticks) {
const range = max - min;
const secPerTick = range / ticks / 1000;
// Need have 10 milisecond margin on the day range
// Need have 10 millisecond margin on the day range
// As sometimes last 24 hour dashboard evaluates to more than 86400000
const oneDay = 86400010;
const oneYear = 31536000000;

2
public/app/plugins/panel/graph/jquery.flot.events.ts
View File

@ -54,7 +54,7 @@ export function createEditPopover(element, event, plot) {
const eventManager = plot.getOptions().events.manager;
if (eventManager.editorOpen) {
// update marker element to attach to (needed in case of legend on the right
// when there is a double render pass and the inital marker element is removed)
// when there is a double render pass and the initial marker element is removed)
markerElementToAttachTo = element;
return;
}

2
public/sass/components/_panel_gettingstarted.scss
View File

@ -1,4 +1,4 @@
// Colours
// Colors
$progress-color-dark: $panel-bg !default;
$progress-color: $panel-bg !default;
$progress-color-light: $panel-bg !default;