Skip to content
Snippets Groups Projects
Commit 26ff2494 authored by Sameer Al-Sakran's avatar Sameer Al-Sakran
Browse files

Merge branch 'master' into fix_lint_errors

parents 18dcca4a a267aa13
No related branches found
No related tags found
No related merge requests found
......@@ -124,6 +124,7 @@ Integration tests use an enforced file naming convention `<test-suite-name>.inte
Useful commands:
```bash
./bin/build version uberjar # Builds the JAR without frontend assets; run this every time you need to update the backend
lein run refresh-integration-test-db-metadata # Scan the sample dataset and re-run sync/classification/field values caching
yarn run test-integrated-watch # Watches for file changes and runs the tests that have changed
yarn run test-integrated-watch -- TestFileName # Watches the files in paths that match the given (regex) string
```
......
/* eslint "react/prop-types": "warn" */
import React, { Component } from "react";
import PropTypes from "prop-types";
import { t } from "c-3po";
import {
LeftNavPane,
......@@ -20,8 +21,8 @@ export default class AdminPeopleApp extends Component {
<AdminLayout
sidebar={
<LeftNavPane>
<LeftNavPaneItem name="People" path="/admin/people" index />
<LeftNavPaneItem name="Groups" path="/admin/people/groups" />
<LeftNavPaneItem name={t`People`} path="/admin/people" index />
<LeftNavPaneItem name={t`Groups`} path="/admin/people/groups" />
</LeftNavPane>
}
>
......
......@@ -211,7 +211,7 @@ export default class LoginApp extends Component {
})}
disabled={!this.state.valid}
>
Sign in
{t`Sign in`}
</button>
<Link
to={
......
......@@ -93,27 +93,27 @@ export default class Navbar extends Component {
<ul className="sm-ml4 flex flex-full">
<AdminNavItem
name="Settings"
name={t`Settings`}
path="/admin/settings"
currentPath={this.props.path}
/>
<AdminNavItem
name="People"
name={t`People`}
path="/admin/people"
currentPath={this.props.path}
/>
<AdminNavItem
name="Data Model"
name={t`Data Model`}
path="/admin/datamodel"
currentPath={this.props.path}
/>
<AdminNavItem
name="Databases"
name={t`Databases`}
path="/admin/databases"
currentPath={this.props.path}
/>
<AdminNavItem
name="Permissions"
name={t`Permissions`}
path="/admin/permissions"
currentPath={this.props.path}
/>
......
......@@ -122,7 +122,7 @@ export default class DatabaseConnectionStep extends Component {
return (
<label className="Select Form-offset mt1">
<select defaultValue={engine} onChange={this.chooseDatabaseEngine}>
<option value="">Select the type of Database you use</option>
<option value="">{t`Select the type of Database you use`}</option>
{engineNames.map(opt => (
<option key={opt} value={opt}>
{engines[opt]["driver-name"]}
......@@ -185,7 +185,7 @@ export default class DatabaseConnectionStep extends Component {
formError={formError}
hiddenFields={{ ssl: true }}
submitFn={this.connectionDetailsCaptured}
submitButtonText={"Next"}
submitButtonText={t`Next`}
/>
) : null}
......
......@@ -103,7 +103,7 @@ export default class PreferencesStep extends Component {
<div className="Form-field Form-offset">
<ul style={{ listStyle: "disc inside", lineHeight: "200%" }}>
<li>{jt`Metabase ${(
<span style={{ fontWeight: "bold" }}>never</span>
<span style={{ fontWeight: "bold" }}>{t`never`}</span>
)} collects anything about your data or question results.`}</li>
<li>{t`All collection is completely anonymous.`}</li>
<li
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment