diff --git a/i18n/messages-en.xtb b/i18n/messages-en.xtb index f66bd65b7f19..fa6a82339448 100644 --- a/i18n/messages-en.xtb +++ b/i18n/messages-en.xtb @@ -107,4 +107,27 @@ Protocol Protocol is required Invalid protocol + Daemon sets + Deployments + Replica sets + Replication controllers + Pods + Deploy a containerized app + Name + Labels + Cluster IP + Internal endpoints + External endpoints + Pods + Resource Details + Details + Name + Namespace + Label selector + Labels + Type + Connection + Cluster IP + Internal endpoints + External endpoints \ No newline at end of file diff --git a/i18n/messages-ja.xtb b/i18n/messages-ja.xtb index 31b7592dcd4b..e2a980658936 100644 --- a/i18n/messages-ja.xtb +++ b/i18n/messages-ja.xtb @@ -107,4 +107,27 @@ Protocol Protocol is required Invalid protocol + Daemon sets + Deployments + Replica sets + Replication controllers + Pods + Deploy a containerized app + Name + Labels + Cluster IP + Internal endpoints + External endpoints + Pods + Resource Details + Details + Name + Namespace + Label selector + Labels + Type + Connection + Cluster IP + Internal endpoints + External endpoints \ No newline at end of file diff --git a/src/app/frontend/servicedetail/servicedetail.html b/src/app/frontend/servicedetail/servicedetail.html index 2889bd663809..31810844874a 100644 --- a/src/app/frontend/servicedetail/servicedetail.html +++ b/src/app/frontend/servicedetail/servicedetail.html @@ -17,7 +17,7 @@ - Pods + {{::ctrl.i18n.MSG_SERVICE_DETAIL_PODS_TITLE}} diff --git a/src/app/frontend/servicedetail/servicedetail_controller.js b/src/app/frontend/servicedetail/servicedetail_controller.js index db39a003f978..018d0a5de0af 100644 --- a/src/app/frontend/servicedetail/servicedetail_controller.js +++ b/src/app/frontend/servicedetail/servicedetail_controller.js @@ -23,5 +23,13 @@ export class ServiceDetailController { constructor(serviceDetail) { /** @export {!backendApi.ServiceDetail} */ this.serviceDetail = serviceDetail; + + /** @export */ + this.i18n = i18n; } } + +const i18n = { + /** @export {string} @desc Title 'Pods', which appears at the top of the pods list on the service detail view. */ + MSG_SERVICE_DETAIL_PODS_TITLE: goog.getMsg('Pods'), +}; diff --git a/src/app/frontend/servicedetail/servicedetailinfo.html b/src/app/frontend/servicedetail/servicedetailinfo.html index 54f961fc9913..fddb058e29dc 100644 --- a/src/app/frontend/servicedetail/servicedetailinfo.html +++ b/src/app/frontend/servicedetail/servicedetailinfo.html @@ -15,15 +15,15 @@ --> - Resource Details - - + {{::$ctrl.i18n.MSG_SERVICE_DETAIL_RESOURCE_DETAILS_TITLE}} + + - + {{::$ctrl.service.objectMeta.namespace}} - +
@@ -31,7 +31,7 @@ none - +
@@ -39,19 +39,19 @@ none - + {{::$ctrl.service.type}} - - + + {{::$ctrl.service.clusterIP}} - + - + diff --git a/src/app/frontend/servicedetail/servicedetailinfo_component.js b/src/app/frontend/servicedetail/servicedetailinfo_component.js index 6329cfe31699..1c536210bc8c 100644 --- a/src/app/frontend/servicedetail/servicedetailinfo_component.js +++ b/src/app/frontend/servicedetail/servicedetailinfo_component.js @@ -12,6 +12,17 @@ // See the License for the specific language governing permissions and // limitations under the License. +/** + * Service info controller. + * @final + */ +class ServiceInfoController { + constructor() { + /** @export */ + this.i18n = i18n; + } +} + /** * Definition object for the component that displays service info. * @@ -23,4 +34,31 @@ export const serviceInfoComponent = { /** {!backendApi.ServiceDetail} */ 'service': '<', }, + controller: ServiceInfoController, +}; + +const i18n = { + /** @export {string} @desc Title 'Resource details' at the top service details view. */ + MSG_SERVICE_DETAIL_RESOURCE_DETAILS_TITLE: goog.getMsg('Resource Details'), + /** @export {string} @desc Subtitle 'Details' at the top of the resource details column at the service detail view. */ + MSG_SERVICE_DETAIL_DETAILS_SUBTITLE: goog.getMsg('Details'), + /** @export {string} @desc Label 'Name' for the service name in details part (left) of the service details view. */ + MSG_SERVICE_DETAIL_NAME_LABEL: goog.getMsg('Name'), + /** @export {string} @desc Label 'Namespace' for the service namespace in the details part (left) of the service details view. */ + MSG_SERVICE_DETAIL_NAMESPACE_LABEL: goog.getMsg('Namespace'), + /** @export {string} @desc Label 'Label selector' for the service's label selector in the details part (left) of the service details view. */ + MSG_SERVICE_DETAIL_LABEL_SELECTOR_LABEL: goog.getMsg('Label selector'), + /** @export {string} @desc Label 'Labels' for the service labels in the details part (left) of the service details view. */ + MSG_SERVICE_DETAIL_LABELS_LABEL: goog.getMsg('Labels'), + /** @export {string} @desc Label 'Type' for the service type in the details part (left) of the service details view. */ + MSG_SERVICE_DETAIL_TYPE_LABEL: goog.getMsg('Type'), + /** @export {string} @desc Subtitle 'Connection' at the top of the column about network connectivity (right) at the service detail view.*/ + MSG_SERVICE_DETAIL_CONNECTION_SUBTITLE: goog.getMsg('Connection'), + /** @export {string} @desc Label 'Cluster IP' for the service IP in the cluster, appears in the connectivity part (right) of the service details view.*/ + MSG_SERVICE_DETAIL_CLUSTER_IP_LABEL: goog.getMsg('Cluster IP'), + /** @export {string} @desc Label 'Internal endpoints' for the internal endpoints of the service, appears in the connectivity part (right) of the service details view.*/ + MSG_SERVICE_DETAIL_INTERNAL_ENDPOINTS_LABEL: goog.getMsg('Internal endpoints'), + /** @export {string} @desc Label 'External endpoints' for the external endpoints of the service, appears in the connectivity part (right) of the service details view. */ + MSG_SERVICE_DETAIL_EXTERNAL_ENDPOINTS_LABEL: goog.getMsg('External endpoints'), + }; diff --git a/src/app/frontend/servicelist/servicecardlist_component.js b/src/app/frontend/servicelist/servicecardlist_component.js index 728b9c77fe00..7a38d71932e1 100644 --- a/src/app/frontend/servicelist/servicecardlist_component.js +++ b/src/app/frontend/servicelist/servicecardlist_component.js @@ -22,7 +22,13 @@ export class ServiceCardListController { * @param {!ui.router.$state} $state * @ngInject */ - constructor($state) { this.state_ = $state; } + constructor($state) { + /** @type {!ui.router.$state} */ + this.state_ = $state; + + /** @export */ + this.i18n = i18n; + } /** * @param {!backendApi.Service} service @@ -52,3 +58,16 @@ export const serviceCardListComponent = { 'withStatuses': '<', }, }; + +const i18n = { + /** @export {string} @desc Label 'Name' which appears as a column label in the table of services (service list view). */ + MSG_SERVICE_LIST_NAME_LABEL: goog.getMsg('Name'), + /** @export {string} @desc Label 'Labels' which appears as a column label in the table of services (service list view). */ + MSG_SERVICE_LIST_LABELS_LABEL: goog.getMsg('Labels'), + /** @export {string} @desc Label 'Cluster IP' which appears as a column label in the table of services (service list view). */ + MSG_SERVICE_LIST_CLUSTER_IP_LABEL: goog.getMsg('Cluster IP'), + /** @export {string} @desc Label 'Internal endpoints' which appears as a column label in the table of services (service list view). */ + MSG_SERVICE_LIST_INTERNAL_ENDPOINTS_LABEL: goog.getMsg('Internal endpoints'), + /** @export {string} @desc Label 'External endpoints' which appears as a column label in the table of services (service list view). */ + MSG_SERVICE_LIST_EXTERNAL_ENDPOINTS_LABEL: goog.getMsg('External endpoints'), +}; diff --git a/src/app/frontend/workloads/workloads.html b/src/app/frontend/workloads/workloads.html index c0c14819f853..0a38c9fd3b86 100644 --- a/src/app/frontend/workloads/workloads.html +++ b/src/app/frontend/workloads/workloads.html @@ -17,7 +17,7 @@ - Daemon sets + {{::$ctrl.i18n.MSG_WORKLOADS_DEAMON_SETS_LABEL}} @@ -29,7 +29,7 @@ - Deployments + {{::$ctrl.i18n.MSG_WORKLOADS_DEPLOYMENTS_LABEL}} @@ -41,7 +41,7 @@ - Replica Sets + {{::$ctrl.i18n.MSG_WORKLOADS_REPLICA_SETS_LABEL}} @@ -53,7 +53,7 @@ - Replication Controllers + {{::$ctrl.i18n.MSG_WORKLOADS_REPLICATION_CONTROLLERS_LABEL}} @@ -66,7 +66,7 @@ - Pods + {{::$ctrl.i18n.MSG_WORKLOADS_PODS_LABEL}} diff --git a/src/app/frontend/workloads/workloads_controller.js b/src/app/frontend/workloads/workloads_controller.js index 1949ea52ff5e..951b67ef3ec9 100644 --- a/src/app/frontend/workloads/workloads_controller.js +++ b/src/app/frontend/workloads/workloads_controller.js @@ -23,5 +23,21 @@ export class WorkloadsController { constructor(workloads) { /** @export {!backendApi.Workloads} */ this.workloads = workloads; + + /** @export */ + this.i18n = i18n; } } + +const i18n = { + /** @export {string} @desc Label "Daemon sets", which appears above the daemon sets list on the workloads page. */ + MSG_WORKLOADS_DEAMON_SETS_LABEL: goog.getMsg('Daemon sets'), + /** @export {string} @desc Label "Deployments", which appears above the deployments list on the workloads page.*/ + MSG_WORKLOADS_DEPLOYMENTS_LABEL: goog.getMsg('Deployments'), + /** @export {string} @desc Label "Replica sets", which appears above the replica sets list on the workloads page.*/ + MSG_WORKLOADS_REPLICA_SETS_LABEL: goog.getMsg('Replica sets'), + /** @export {string} @desc Label "Replication controllers", which appears above the replication controllers list on the workloads page.*/ + MSG_WORKLOADS_REPLICATION_CONTROLLERS_LABEL: goog.getMsg('Replication controllers'), + /** @export {string} @desc Label "Pods", which appears above the pods list on the workloads page.*/ + MSG_WORKLOADS_PODS_LABEL: goog.getMsg('Pods'), +}; diff --git a/src/app/frontend/workloads/workloadsactionbar.html b/src/app/frontend/workloads/workloadsactionbar.html index 6ad46e1aeb9d..f21d25dc6cf4 100644 --- a/src/app/frontend/workloads/workloadsactionbar.html +++ b/src/app/frontend/workloads/workloadsactionbar.html @@ -16,5 +16,5 @@ add - Deploy a containerized app + {{::$ctrl.i18n.MSG_WORKLOADS_ACTION_BAR_DEPLOY_TOOLTIP}} diff --git a/src/app/frontend/workloads/workloadsactionbar_controller.js b/src/app/frontend/workloads/workloadsactionbar_controller.js index 39127e44c60d..cfd27952a647 100644 --- a/src/app/frontend/workloads/workloadsactionbar_controller.js +++ b/src/app/frontend/workloads/workloadsactionbar_controller.js @@ -25,6 +25,9 @@ export class WorkloadsActionBarController { constructor($state) { /** @private {!ui.router.$state} */ this.state_ = $state; + + /** @export */ + this.i18n = i18n; } /** @@ -32,3 +35,8 @@ export class WorkloadsActionBarController { */ redirectToDeployPage() { this.state_.go(deploy); } } + +const i18n = { + /** @export {string} @desc This tooltip appears when the user hovers over the "+" (Deploy) button on the workloads page. */ + MSG_WORKLOADS_ACTION_BAR_DEPLOY_TOOLTIP: goog.getMsg('Deploy a containerized app'), +};