Skip to content

Commit

Permalink
i18n fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaron Caldwell committed Apr 22, 2020
1 parent d3e91ae commit d74a772
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 66 deletions.
39 changes: 24 additions & 15 deletions src/plugins/maps_legacy/public/components/wms_internal_options.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ interface WmsInternalOptions {
function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
const wmsLink = (
<EuiLink href="http://www.opengeospatial.org/standards/wms" target="_blank">
<FormattedMessage id="tileMap.wmsOptions.wmsLinkText" defaultMessage="OGC standard" />
<FormattedMessage id="maps_legacy.wmsOptions.wmsLinkText" defaultMessage="OGC standard" />
</EuiLink>
);
const footnoteText = (
<>
<span aria-hidden="true">*</span>
<FormattedMessage
id="tileMap.wmsOptions.mapLoadFailDescription"
id="maps_legacy.wmsOptions.mapLoadFailDescription"
defaultMessage="If this parameter is incorrect, maps will fail to load."
/>
</>
Expand All @@ -64,7 +64,7 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
<EuiSpacer size="xs" />
<EuiText size="xs">
<FormattedMessage
id="tileMap.wmsOptions.wmsDescription"
id="maps_legacy.wmsOptions.wmsDescription"
defaultMessage="WMS is an {wmsLink} for map image services."
values={{ wmsLink }}
/>
Expand All @@ -74,14 +74,14 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
<TextInputOption
label={
<>
<FormattedMessage id="tileMap.wmsOptions.wmsUrlLabel" defaultMessage="WMS url" />
<FormattedMessage id="maps_legacy.wmsOptions.wmsUrlLabel" defaultMessage="WMS url" />
<span aria-hidden="true">*</span>
</>
}
helpText={
<>
<FormattedMessage
id="tileMap.wmsOptions.urlOfWMSWebServiceTip"
id="maps_legacy.wmsOptions.urlOfWMSWebServiceTip"
defaultMessage="The URL of the WMS web service."
/>
{footnote}
Expand All @@ -95,14 +95,17 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
<TextInputOption
label={
<>
<FormattedMessage id="tileMap.wmsOptions.wmsLayersLabel" defaultMessage="WMS layers" />
<FormattedMessage
id="maps_legacy.wmsOptions.wmsLayersLabel"
defaultMessage="WMS layers"
/>
<span aria-hidden="true">*</span>
</>
}
helpText={
<>
<FormattedMessage
id="tileMap.wmsOptions.listOfLayersToUseTip"
id="maps_legacy.wmsOptions.listOfLayersToUseTip"
defaultMessage="A comma separated list of layers to use."
/>
{footnote}
Expand All @@ -117,7 +120,7 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
label={
<>
<FormattedMessage
id="tileMap.wmsOptions.wmsVersionLabel"
id="maps_legacy.wmsOptions.wmsVersionLabel"
defaultMessage="WMS version"
/>
<span aria-hidden="true">*</span>
Expand All @@ -126,7 +129,7 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
helpText={
<>
<FormattedMessage
id="tileMap.wmsOptions.versionOfWMSserverSupportsTip"
id="maps_legacy.wmsOptions.versionOfWMSserverSupportsTip"
defaultMessage="The version of WMS the server supports."
/>
{footnote}
Expand All @@ -140,14 +143,17 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
<TextInputOption
label={
<>
<FormattedMessage id="tileMap.wmsOptions.wmsFormatLabel" defaultMessage="WMS format" />
<FormattedMessage
id="maps_legacy.wmsOptions.wmsFormatLabel"
defaultMessage="WMS format"
/>
<span aria-hidden="true">*</span>
</>
}
helpText={
<>
<FormattedMessage
id="tileMap.wmsOptions.imageFormatToUseTip"
id="maps_legacy.wmsOptions.imageFormatToUseTip"
defaultMessage="Usually image/png or image/jpeg. Use png if the server will return transparent layers."
/>
{footnote}
Expand All @@ -161,13 +167,13 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
<TextInputOption
label={
<FormattedMessage
id="tileMap.wmsOptions.wmsAttributionLabel"
id="maps_legacy.wmsOptions.wmsAttributionLabel"
defaultMessage="WMS attribution"
/>
}
helpText={
<FormattedMessage
id="tileMap.wmsOptions.attributionStringTip"
id="maps_legacy.wmsOptions.attributionStringTip"
defaultMessage="Attribution string for the lower right corner."
/>
}
Expand All @@ -179,14 +185,17 @@ function WmsInternalOptions({ wms, setValue }: WmsInternalOptions) {
<TextInputOption
label={
<>
<FormattedMessage id="tileMap.wmsOptions.wmsStylesLabel" defaultMessage="WMS styles" />
<FormattedMessage
id="maps_legacy.wmsOptions.wmsStylesLabel"
defaultMessage="WMS styles"
/>
<span aria-hidden="true">*</span>
</>
}
helpText={
<>
<FormattedMessage
id="tileMap.wmsOptions.wmsServerSupportedStylesListTip"
id="maps_legacy.wmsOptions.wmsServerSupportedStylesListTip"
defaultMessage="A comma separated list of WMS server supported styles to use. Blank in most cases."
/>
{footnote}
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/maps_legacy/public/components/wms_options.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@ function WmsOptions({ stateParams, setValue, vis }: Props) {
<EuiTitle size="xs">
<h2>
<FormattedMessage
id="tileMap.wmsOptions.baseLayerSettingsTitle"
id="maps_legacy.wmsOptions.baseLayerSettingsTitle"
defaultMessage="Base layer settings"
/>
</h2>
</EuiTitle>
<EuiSpacer size="s" />

<SwitchOption
label={i18n.translate('tileMap.wmsOptions.wmsMapServerLabel', {
label={i18n.translate('maps_legacy.wmsOptions.wmsMapServerLabel', {
defaultMessage: 'WMS map server',
})}
tooltip={i18n.translate('tileMap.wmsOptions.useWMSCompliantMapTileServerTip', {
tooltip={i18n.translate('maps_legacy.wmsOptions.useWMSCompliantMapTileServerTip', {
defaultMessage: 'Use WMS compliant map tile server. For advanced users only.',
})}
paramName="enabled"
Expand All @@ -83,7 +83,7 @@ function WmsOptions({ stateParams, setValue, vis }: Props) {
<EuiSpacer size="s" />
<SelectOption
id="wmsOptionsSelectTmsLayer"
label={i18n.translate('tileMap.wmsOptions.layersLabel', {
label={i18n.translate('maps_legacy.wmsOptions.layersLabel', {
defaultMessage: 'Layers',
})}
options={tmsLayerOptions}
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/maps_legacy/public/map/base_maps_visualization.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export function BaseMapsVisualizationProvider(getKibanaMap, mapServiceSettings)

async _updateData() {
throw new Error(
i18n.translate('tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage', {
i18n.translate('maps_legacy.baseMapsVisualization.childShouldImplementMethodErrorMessage', {
defaultMessage: 'Child should implement this method to respond to data-update',
})
);
Expand Down
26 changes: 3 additions & 23 deletions x-pack/plugins/translations/translations/ja-JP.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2295,6 +2295,8 @@
"kbn.management.landing.header": "Kibana {version} 管理",
"kbn.management.landing.subhead": "インデックス、インデックスパターン、保存されたオブジェクト、Kibana の設定、その他を管理します。",
"kbn.management.landing.text": "すべてのツールの一覧は、左のメニューにあります。",
"kbn.managementTitle": "管理",
"kbn.visualizeTitle": "可視化",
"savedObjectsManagement.indexPattern.confirmOverwriteButton": "上書き",
"savedObjectsManagement.indexPattern.confirmOverwriteLabel": "「{title}」に上書きしてよろしいですか？",
"savedObjectsManagement.indexPattern.confirmOverwriteTitle": "{type} を上書きしますか？",
Expand Down Expand Up @@ -2416,8 +2418,6 @@
"savedObjectsManagement.breadcrumb.index": "保存されたオブジェクト",
"savedObjectsManagement.field.offLabel": "オフ",
"savedObjectsManagement.field.onLabel": "オン",
"kbn.managementTitle": "管理",
"kbn.visualizeTitle": "可視化",
"kibana_legacy.bigUrlWarningNotificationMessage": "{advancedSettingsLink}で{storeInSessionStorageParam}オプションを有効にするか、オンスクリーンビジュアルを簡素化してください。",
"kibana_legacy.bigUrlWarningNotificationMessage.advancedSettingsLinkText": "高度な設定",
"kibana_legacy.bigUrlWarningNotificationTitle": "URLが大きく、Kibanaの動作が停止する可能性があります",
Expand Down Expand Up @@ -2593,7 +2593,6 @@
"telemetry.welcomeBanner.enableButtonLabel": "有効にする",
"telemetry.welcomeBanner.telemetryConfigDetailsDescription.telemetryPrivacyStatementLinkText": "遠隔測定に関するプライバシーステートメント",
"telemetry.welcomeBanner.title": "Elastic Stack の改善にご協力ください",
"tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage": "子は data-update に対応できるようこのメソドを導入する必要があります",
"tileMap.function.help": "タイルマップのビジュアライゼーションです",
"tileMap.geohashLayer.mapTitle": "{mapType} マップタイプが認識されません",
"tileMap.tooltipFormatter.latitudeLabel": "緯度",
Expand All @@ -2615,25 +2614,6 @@
"tileMap.visParams.desaturateTilesLabel": "タイルを不飽和化",
"tileMap.visParams.mapTypeLabel": "マップタイプ",
"tileMap.visParams.reduceVibrancyOfTileColorsTip": "色の鮮明度を下げます。この機能は Internet Explorer ではバージョンにかかわらず利用できません。",
"tileMap.wmsOptions.attributionStringTip": "右下角の属性文字列",
"tileMap.wmsOptions.baseLayerSettingsTitle": "ベースレイヤー設定",
"tileMap.wmsOptions.imageFormatToUseTip": "通常画像/png または画像/jpeg です。サーバーが透明レイヤーを返す場合は png を使用します。",
"tileMap.wmsOptions.layersLabel": "レイヤー",
"tileMap.wmsOptions.listOfLayersToUseTip": "使用するレイヤーのコンマ区切りのリストです。",
"tileMap.wmsOptions.mapLoadFailDescription": "このパラメーターが正しくないと、マップが正常に読み込まれません。",
"tileMap.wmsOptions.urlOfWMSWebServiceTip": "WMS web サービスの URL です。",
"tileMap.wmsOptions.useWMSCompliantMapTileServerTip": "WMS 対応のマップタイルサーバーを使用します。上級者向けです。",
"tileMap.wmsOptions.versionOfWMSserverSupportsTip": "サーバーがサポートしている WMS のバージョンです。",
"tileMap.wmsOptions.wmsAttributionLabel": "WMS 属性",
"tileMap.wmsOptions.wmsDescription": "WMS は、マップイメージサービスの {wmsLink} です。",
"tileMap.wmsOptions.wmsFormatLabel": "WMS フォーマット",
"tileMap.wmsOptions.wmsLayersLabel": "WMS レイヤー",
"tileMap.wmsOptions.wmsLinkText": "OGC スタンダード",
"tileMap.wmsOptions.wmsMapServerLabel": "WMS マップサーバー",
"tileMap.wmsOptions.wmsServerSupportedStylesListTip": "WMS サーバーがサポートしている使用スタイルのコンマ区切りのリストです。大抵は空白のままです。",
"tileMap.wmsOptions.wmsStylesLabel": "WMS スタイル",
"tileMap.wmsOptions.wmsUrlLabel": "WMS URL",
"tileMap.wmsOptions.wmsVersionLabel": "WMS バージョン",
"timelion.badge.readOnly.text": "読み込み専用",
"timelion.badge.readOnly.tooltip": "Timelion シートを保存できません",
"timelion.breadcrumbs.create": "作成",
Expand Down Expand Up @@ -16738,4 +16718,4 @@
"xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "フィールドを選択してください。",
"xpack.watcher.watcherDescription": "アラートの作成、管理、監視によりデータへの変更を検知します。"
}
}
}
26 changes: 3 additions & 23 deletions x-pack/plugins/translations/translations/zh-CN.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2296,6 +2296,8 @@
"kbn.management.landing.header": "Kibana {version} 管理",
"kbn.management.landing.subhead": "管理您的索引、索引模式、已保存对象、Kibana 设置等等。",
"kbn.management.landing.text": "应用的完整列表位于左侧菜单中。",
"kbn.managementTitle": "管理",
"kbn.visualizeTitle": "可视化",
"savedObjectsManagement.indexPattern.confirmOverwriteButton": "覆盖",
"savedObjectsManagement.indexPattern.confirmOverwriteLabel": "确定要覆盖 “{title}”？",
"savedObjectsManagement.indexPattern.confirmOverwriteTitle": "覆盖“{type}”？",
Expand Down Expand Up @@ -2417,8 +2419,6 @@
"savedObjectsManagement.view.viewItemTitle": "查看“{title}”",
"savedObjectsManagement.breadcrumb.edit": "编辑 {savedObjectType}",
"savedObjectsManagement.breadcrumb.index": "已保存对象",
"kbn.managementTitle": "管理",
"kbn.visualizeTitle": "可视化",
"kibana_legacy.bigUrlWarningNotificationMessage": "在{advancedSettingsLink}中启用“{storeInSessionStorageParam}”选项或简化屏幕视觉效果。",
"kibana_legacy.bigUrlWarningNotificationMessage.advancedSettingsLinkText": "高级设置",
"kibana_legacy.bigUrlWarningNotificationTitle": "URL 过长，Kibana 可能无法工作",
Expand Down Expand Up @@ -2594,7 +2594,6 @@
"telemetry.welcomeBanner.enableButtonLabel": "启用",
"telemetry.welcomeBanner.telemetryConfigDetailsDescription.telemetryPrivacyStatementLinkText": "遥测隐私声明",
"telemetry.welcomeBanner.title": "帮助我们改进 Elastic Stack",
"tileMap.baseMapsVisualization.childShouldImplementMethodErrorMessage": "子函数应实现此方法以响应数据更新",
"tileMap.function.help": "磁贴地图可视化",
"tileMap.geohashLayer.mapTitle": "{mapType} 地图类型无法识别",
"tileMap.tooltipFormatter.latitudeLabel": "纬度",
Expand All @@ -2616,25 +2615,6 @@
"tileMap.visParams.desaturateTilesLabel": "降低平铺地图饱和度",
"tileMap.visParams.mapTypeLabel": "地图类型",
"tileMap.visParams.reduceVibrancyOfTileColorsTip": "降低平铺地图颜色的亮度。此设置在任何版本的 IE 浏览器中均不起作用。",
"tileMap.wmsOptions.attributionStringTip": "右下角的属性字符串。",
"tileMap.wmsOptions.baseLayerSettingsTitle": "基础图层设置",
"tileMap.wmsOptions.imageFormatToUseTip": "通常为 image/png 或 image/jpeg。如果服务器返回透明图层，则使用 png。",
"tileMap.wmsOptions.layersLabel": "图层",
"tileMap.wmsOptions.listOfLayersToUseTip": "要使用的图层逗号分隔列表。",
"tileMap.wmsOptions.mapLoadFailDescription": "如果此参数不正确，将无法加载地图。",
"tileMap.wmsOptions.urlOfWMSWebServiceTip": "WMS Web 服务的 URL。",
"tileMap.wmsOptions.useWMSCompliantMapTileServerTip": "使用符合 WMS 规范的平铺地图服务器。仅适用于高级用户。",
"tileMap.wmsOptions.versionOfWMSserverSupportsTip": "服务器支持的 WMS 版本。",
"tileMap.wmsOptions.wmsAttributionLabel": "WMS 属性",
"tileMap.wmsOptions.wmsDescription": "WMS 是用于地图图像服务的 {wmsLink}。",
"tileMap.wmsOptions.wmsFormatLabel": "WMS 格式",
"tileMap.wmsOptions.wmsLayersLabel": "WMS 图层",
"tileMap.wmsOptions.wmsLinkText": "OGC 标准",
"tileMap.wmsOptions.wmsMapServerLabel": "WMS 地图服务器",
"tileMap.wmsOptions.wmsServerSupportedStylesListTip": "要使用的以逗号分隔的 WMS 服务器支持的样式列表。在大部分情况下为空。",
"tileMap.wmsOptions.wmsStylesLabel": "WMS 样式",
"tileMap.wmsOptions.wmsUrlLabel": "WMS url",
"tileMap.wmsOptions.wmsVersionLabel": "WMS 版本",
"timelion.badge.readOnly.text": "只读",
"timelion.badge.readOnly.tooltip": "无法保存 Timelion 工作表",
"timelion.breadcrumbs.create": "创建",
Expand Down Expand Up @@ -16743,4 +16723,4 @@
"xpack.watcher.watchEdit.thresholdWatchExpression.aggType.fieldIsRequiredValidationMessage": "此字段必填。",
"xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。"
}
}
}

0 comments on commit d74a772

Please sign in to comment.