Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d65ffc8

Browse files
alexcjohnsonalexcjohnson
committed
Merge branch 'master' into configurable-select-direction
2 parents 69c3157 + 2a628df commit d65ffc8

File tree

201 files changed

+10833
-2714
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

201 files changed

+10833
-2714
lines changed

‎.circleci/config.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,25 @@ jobs:
9797
- store_artifacts:
9898
path: build
9999

100+
test-image2:
101+
docker:
102+
- image: plotly/testbed:latest
103+
working_directory: /var/www/streambed/image_server/plotly.js/
104+
steps:
105+
- checkout
106+
- attach_workspace:
107+
at: /var/www/streambed/image_server/plotly.js/
108+
- run:
109+
name: Run and setup container
110+
command: |
111+
supervisord &
112+
npm run docker -- setup
113+
- run:
114+
name: Run image tests
115+
command: ./.circleci/test.sh image2
116+
- store_artifacts:
117+
path: build
118+
100119
test-syntax:
101120
docker:
102121
- image: circleci/node:8.9.4
@@ -123,6 +142,9 @@ workflows:
123142
- test-image:
124143
requires:
125144
- build
145+
- test-image2:
146+
requires:
147+
- build
126148
- test-syntax:
127149
requires:
128150
- build

‎.circleci/test.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ case $1 in
4141

4242
image)
4343
npm run test-image || EXIT_STATE=$?
44+
exit $EXIT_STATE
45+
;;
46+
47+
image2)
4448
npm run test-export || EXIT_STATE=$?
4549
npm run test-image-gl2d || EXIT_STATE=$?
4650
exit $EXIT_STATE

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Thanks for your interest in plotly.js!
33
### Translations:
44

55
- Make a PR directly to the main repository
6-
- Label it `type: translation`
76
- Please @ mention a few other speakers of this language who can help review your translations.
87
- If you've omitted any keys from [dist/translation_keys.txt](https://github.com/plotly/plotly.js/blob/master/dist/translation-keys.txt) - which means they will fall back on the US English text - just make a short comment about why in the PR description: the English text works fine in your language, or you would like someone else to help translating those, or whatever the reason.
98
- You should only update files in `lib/locales/`, not those in `dist/`

‎lib/index-gl2d.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ var Plotly = require('./core');
1212

1313
Plotly.register([
1414
require('./scattergl'),
15+
require('./splom'),
1516
require('./pointcloud'),
1617
require('./heatmapgl'),
1718
require('./contourgl'),

‎lib/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ Plotly.register([
3131
require('./choropleth'),
3232

3333
require('./scattergl'),
34+
require('./splom'),
35+
3436
require('./pointcloud'),
3537
require('./heatmapgl'),
3638
require('./parcoords'),

‎lib/locales/ja.js

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,66 @@
1111
module.exports = {
1212
moduleType: 'locale',
1313
name: 'ja',
14-
dictionary: {},
14+
dictionary: {
15+
'Autoscale': '自動ズーム', // components/modebar/buttons.js:139
16+
'Box Select': '矩形選択', // components/modebar/buttons.js:103
17+
'Click to enter Colorscale title': '色スケールタイトルを入力するにはクリック', // plots/plots.js:437
18+
'Click to enter Component A title': 'コンポーネントAのタイトル入力するにはクリック', // plots/ternary/ternary.js:386
19+
'Click to enter Component B title': 'コンポーネントBのタイトル入力するにはクリック', // plots/ternary/ternary.js:400
20+
'Click to enter Component C title': 'コンポーネントCのタイトル入力するにはクリック', // plots/ternary/ternary.js:411
21+
'Click to enter Plot title': 'プロットタイトルを入力するにはクリック', // plot_api/plot_api.js:579
22+
'Click to enter X axis title': 'X軸タイトルを入力するにはクリック', // plots/plots.js:435
23+
'Click to enter Y axis title': 'Y軸タイトルを入力するにはクリック', // plots/plots.js:436
24+
'Compare data on hover': 'ホバー中のデータを比較', // components/modebar/buttons.js:167
25+
'Double-click on legend to isolate one trace': '凡例をダブルクリックして1つのトレースを無効化します', // components/legend/handle_click.js:90
26+
'Double-click to zoom back out': 'ダブルクリックでズームを戻します', // plots/cartesian/dragbox.js:299
27+
'Download plot as a png': 'PNGファイルでダウンロード', // components/modebar/buttons.js:52
28+
'Edit in Chart Studio': 'Chart Studioで編集', // components/modebar/buttons.js:76
29+
'IE only supports svg. Changing format to svg.': 'IEはSVGのみサポートしています。SVGに変換します。', // components/modebar/buttons.js:60
30+
'Lasso Select': '投げ縄選択', // components/modebar/buttons.js:112
31+
'Orbital rotation': '軌道回転', // components/modebar/buttons.js:279
32+
'Pan': '拡大', // components/modebar/buttons.js:94
33+
'Produced with Plotly': 'Plotlyにより作成', // components/modebar/modebar.js:256
34+
'Reset': 'リセット', // components/modebar/buttons.js:432
35+
'Reset axes': '軸をリセット', // components/modebar/buttons.js:148
36+
'Reset camera to default': 'カメラをデフォルトに戻す', // components/modebar/buttons.js:314
37+
'Reset camera to last save': 'カメラを最後の保存状態に戻す', // components/modebar/buttons.js:322
38+
'Reset view': 'ビューをリセット', // components/modebar/buttons.js:583
39+
'Reset views': 'ビューをリセット', // components/modebar/buttons.js:529
40+
'Show closest data on hover': 'ホバー時に一番近いデータを表示', // components/modebar/buttons.js:157
41+
'Snapshot succeeded': 'スナップショットに成功', // components/modebar/buttons.js:66
42+
'Sorry, there was a problem downloading your snapshot!': 'すみません、スナップショットダウンロードでエラーです!', // components/modebar/buttons.js:69
43+
'Taking snapshot - this may take a few seconds': 'スナップショットを撮影', // components/modebar/buttons.js:57
44+
'Zoom': 'ズーム', // components/modebar/buttons.js:85
45+
'Zoom in': '拡大', // components/modebar/buttons.js:121
46+
'Zoom out': '縮小', // components/modebar/buttons.js:130
47+
'close:': '閉じる:', // traces/ohlc/transform.js:139
48+
'trace': 'トレース:', // plots/plots.js:439
49+
'lat:': '緯度:', // traces/scattergeo/calc.js:48
50+
'lon:': '経度:', // traces/scattergeo/calc.js:49
51+
'q1:': '第一四分位数:', // traces/box/calc.js:130
52+
'q3:': '第三四分位数:', // traces/box/calc.js:131
53+
'source:': 'ソース:', // traces/sankey/plot.js:140
54+
'target:': 'ターゲット:', // traces/sankey/plot.js:141
55+
'lower fence:': 'フェンス下限:', // traces/box/calc.js:134
56+
'upper fence:': 'フェンス上限:', // traces/box/calc.js:135
57+
'max:': '最大:', // traces/box/calc.js:132
58+
'mean ± σ:': '平均 ± σ:', // traces/box/calc.js:133
59+
'mean:': '平均:', // traces/box/calc.js:133
60+
'median:': '中央値:', // traces/box/calc.js:128
61+
'min:': '最小:', // traces/box/calc.js:129
62+
'Turntable rotation': '軸回転:', // components/modebar/buttons.js:288
63+
'Toggle Spike Lines': 'スパイクラインのオンオフ', // components/modebar/buttons.js:548
64+
'open:': '開く:', // traces/ohlc/transform.js:136
65+
'high:': '高:', // traces/ohlc/transform.js:137
66+
'low:': '低:', // traces/ohlc/transform.js:138
67+
'Toggle show closest data on hover': 'ホバー時に一番近いデータを表示のオンオフ', // components/modebar/buttons.js:353
68+
'incoming flow count:': '流入フローカウント:', // traces/sankey/plot.js:142
69+
'outgoing flow count:': '流出フローカウント:', // traces/sankey/plot.js:143
70+
'kde:': 'kde:', // traces/violin/calc.js:73
71+
'Click to enter radial axis title': '放射軸タイトルを入力するにはクリック',
72+
'new text': '新規テキスト'
73+
},
1574
format: {
1675
days: ['日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日'],
1776
shortDays: ['日', '月', '火', '水', '木', '金', '土'],

‎lib/splom.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* Copyright 2012-2018, Plotly, Inc.
3+
* All rights reserved.
4+
*
5+
* This source code is licensed under the MIT license found in the
6+
* LICENSE file in the root directory of this source tree.
7+
*/
8+
9+
'use strict';
10+
11+
module.exports = require('../src/traces/splom');

‎package-lock.json

Lines changed: 125 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)