Skip to content

Commit

Permalink
Merge branch 'staging' into all-contributors/add-vladshcherbin
Browse files Browse the repository at this point in the history
  • Loading branch information
imolorhe committed Oct 16, 2019
2 parents 2f435dc + d7ba8ed commit d8c6265
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 49 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -112,7 +112,7 @@
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.801.2",
"@types/chrome": "^0.0.89",
"@types/chrome": "^0.0.90",
"@types/electron": "^1.6.10",
"@types/graphql": "^14.2.2",
"@types/jasmine": "3.4.1",
Expand Down
3 changes: 2 additions & 1 deletion packages/altair-electron/package.json
Expand Up @@ -45,5 +45,6 @@
"type": "opencollective",
"url": "https://opencollective.com/altair",
"logo": "https://opencollective.com/altair/logo.txt"
}
},
"gitHead": "e5ce60f5a14997f1471a961ac76efacbb044df46"
}
2 changes: 1 addition & 1 deletion packages/altair-express-middleware/package.json
Expand Up @@ -37,5 +37,5 @@
"@types/express": "^4.11.1",
"typescript": "^2.8.1"
},
"gitHead": "eaad78119e8966f659d2115ff28cf30f27f729bf"
"gitHead": "e5ce60f5a14997f1471a961ac76efacbb044df46"
}
2 changes: 1 addition & 1 deletion packages/altair-koa-middleware/package.json
Expand Up @@ -37,5 +37,5 @@
"devDependencies": {
"typescript": "^2.8.1"
},
"gitHead": "eaad78119e8966f659d2115ff28cf30f27f729bf"
"gitHead": "e5ce60f5a14997f1471a961ac76efacbb044df46"
}
2 changes: 1 addition & 1 deletion packages/altair-static/package.json
Expand Up @@ -31,5 +31,5 @@
"devDependencies": {
"typescript": "^2.8.1"
},
"gitHead": "eaad78119e8966f659d2115ff28cf30f27f729bf"
"gitHead": "e5ce60f5a14997f1471a961ac76efacbb044df46"
}
3 changes: 2 additions & 1 deletion packages/gatsby-plugin-altair-graphql/package.json
Expand Up @@ -29,5 +29,6 @@
},
"dependencies": {
"altair-express-middleware": "^2.3.5"
}
},
"gitHead": "e5ce60f5a14997f1471a961ac76efacbb044df46"
}
3 changes: 3 additions & 0 deletions src/app/services/gql/gql.service.ts
Expand Up @@ -241,6 +241,9 @@ export class GqlService {
return this.sendRequest(url, requestOpts).pipe(
map(data => {
debug.log('introspection', data);
if (!data.ok) {
throw new Error(`Introspection request failed with: ${data.status}`);
}
return data;
}),
catchError((err) => {
Expand Down
78 changes: 39 additions & 39 deletions src/assets/i18n/zh-TW.json
@@ -1,53 +1,53 @@
{
"SEND_REQUEST_BUTTON": "Send Request",
"PRETTIFY_BUTTON": "Prettify",
"COMPRESS_QUERY_BUTTON": "Compress",
"CLEAR_BUTTON": "Clear",
"COPY_AS_CURL_BUTTON": "Copy as cURL",
"SEND_REQUEST_BUTTON": "提交請求",
"PRETTIFY_BUTTON": "美化",
"COMPRESS_QUERY_BUTTON": "壓縮",
"CLEAR_BUTTON": "清空",
"COPY_AS_CURL_BUTTON": "複製爲cURL",
"CONVERT_TO_NAMED_QUERY_BUTTON": "Convert to named query",
"SET_HEADERS_BUTTON": "Set Headers",
"SET_VARIABLES_BUTTON": "Set Variables",
"SET_HEADERS_BUTTON": "設定標題",
"SET_VARIABLES_BUTTON": "設定變數",
"RELOAD_DOCS_BUTTON": "Reload Docs",
"SHOW_DOCS_BUTTON": "Show Docs",
"DOCS_TEXT": "Docs",
"LOADING_INDICATOR_TEXT": "Loading...",
"CANCEL_TEXT": "Cancel",
"SERVER_NO_INTROSPECTION_SUPPORT": "Sorry. The provided server doesn't support introspection.",
"SAVE_BUTTON": "Save",
"DONE_BUTTON": "Done",
"CLICK_HERE_TEXT": "Click here",
"ADD_NEW_WINDOW_TEXT": "+ Add new",
"DOCS_GO_BACK_TEXT": "Back",
"DOCS_EXPORT_SDL": "Export SDL",
"DOCS_LOAD_SCHEMA": "Load Schema",
"LOADING_INDICATOR_TEXT": "載入中...",
"CANCEL_TEXT": "取消",
"SERVER_NO_INTROSPECTION_SUPPORT": "抱歉,所提供的伺服器不支持自我檢查。",
"SAVE_BUTTON": "儲存",
"DONE_BUTTON": "確認",
"CLICK_HERE_TEXT": "點擊此處",
"ADD_NEW_WINDOW_TEXT": "+ 新增",
"DOCS_GO_BACK_TEXT": "返回",
"DOCS_EXPORT_SDL": "匯出SDL",
"DOCS_LOAD_SCHEMA": "載入基模",
"DOCS_SEARCH_INPUT_PLACEHOLDER_TEXT": "Search docs...",
"DOCS_ARGUMENTS_TEXT": "Arguments",
"DOCS_TYPE_TEXT": "Type",
"DOCS_TYPE_TEXT": "類型",
"DOCS_FIELD_TEXT": "Field",
"DOCS_FIELDS_TEXT": "Fields",
"DOCS_SEARCH_RESULTS_TEXT": "Search Results",
"DOCS_VALUES_TEXT": "Values",
"DOCS_DEPRECATED_TEXT": "DEPRECATED",
"DOCS_SEARCH_RESULTS_TEXT": "搜尋結果",
"DOCS_VALUES_TEXT": "",
"DOCS_DEPRECATED_TEXT": "已棄用",
"DOCS_ADD_QUERY_TEXT": "Add Query",
"DOCS_ADD_FRAGMENT_TEXT": "Add Fragment",
"DOCS_UNION_TEXT": "Union",
"DOCS_SUBTYPES_TEXT": "Subtypes",
"DOCS_INTERFACE_TEXT": "Interface",
"DOCS_IMPLEMENTATIONS_TEXT": "Implementations",
"DOCS_IMPLEMENTS_TEXT": "Implements",
"QUERY_RESULT_NO_RESULT_TEXT": "Ezio my friend, how may I be of service?",
"QUERY_RESULT_STATUS_TEXT": "STATUS",
"QUERY_RESULT_STATUS_CODE_TEXT": "STATUS CODE",
"QUERY_RESULT_TIME_SPENT_TEXT": "TIME SPENT",
"QUERY_RESULT_DOWNLOAD_RESULT_BUTTON": "Download",
"SUBSCRIPTIONS_STOP_TEXT": "Stop",
"SUBSCRIPTIONS_CLEAR_TEXT": "Clear",
"VARIABLES_TEXT": "Variables",
"SET_VARIABLES_DIALOG_SUBTEXT": "Add, edit and remove variables in your request",
"HEADERS_TEXT": "Headers",
"SET_HEADERS_DIALOG_SUBTEXT": "Add, edit and remove headers in your request",
"ADD_HEADER_TEXT": "Add header",
"SUBSCRIPTION_URL_TEXT": "Subscription URL",
"DOCS_UNION_TEXT": "聯集",
"DOCS_SUBTYPES_TEXT": "子類型",
"DOCS_INTERFACE_TEXT": "介面",
"DOCS_IMPLEMENTATIONS_TEXT": "實現方法",
"DOCS_IMPLEMENTS_TEXT": "實現",
"QUERY_RESULT_NO_RESULT_TEXT": "我的朋友Ezio,我可以幫到你嗎?",
"QUERY_RESULT_STATUS_TEXT": "狀態",
"QUERY_RESULT_STATUS_CODE_TEXT": "狀態碼",
"QUERY_RESULT_TIME_SPENT_TEXT": "用時",
"QUERY_RESULT_DOWNLOAD_RESULT_BUTTON": "下載",
"SUBSCRIPTIONS_STOP_TEXT": "結束",
"SUBSCRIPTIONS_CLEAR_TEXT": "清空",
"VARIABLES_TEXT": "變數",
"SET_VARIABLES_DIALOG_SUBTEXT": "依你的指示新增、變動及移除變數",
"HEADERS_TEXT": "標題",
"SET_HEADERS_DIALOG_SUBTEXT": "依你的指示新增、變動及移除標題",
"ADD_HEADER_TEXT": "新增標題",
"SUBSCRIPTION_URL_TEXT": "訂閱網址",
"SET_SUBSCRIPTION_URL_TEXT": "Enter the subscription URL for your server below",
"SUBSCRIPTION_CONNECTION_PARAMS_TEXT": "Connection Parameters (in JSON)",
"HISTORY_TEXT": "History",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -1363,10 +1363,10 @@
"@types/events" "*"
"@types/node" "*"

"@types/chrome@^0.0.89":
version "0.0.89"
resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.89.tgz#0d5baef543aaa0715b345b57b86cba6ca708b524"
integrity sha512-nWgL4U38SnIuMpG2rKMCGDknfZb193KFY15imqHUVFF4IJAVXvdEJOOgtcX9v2XsAaZiz2UUOInvWk5x1DhENQ==
"@types/chrome@^0.0.90":
version "0.0.90"
resolved "https://registry.yarnpkg.com/@types/chrome/-/chrome-0.0.90.tgz#687f8738925be23619f4bf1d66fdf7f66f2d7cbc"
integrity sha512-GrfPqHjNucBqWM3vLrJhQw684SGJMl3UBu+7EzYyo4I34HMBY3ImHNitCSdzsI1o8x8U0nRRe3M3FXeYgY/bYw==
dependencies:
"@types/filesystem" "*"

Expand Down

0 comments on commit d8c6265

Please sign in to comment.