From b55878d968de725d7764ce3190ee4e3192b7fcf7 Mon Sep 17 00:00:00 2001
From: Menaka Jayawardena
Date: Fri, 6 Oct 2017 12:42:40 +0530
Subject: [PATCH] Added i18n definitions.
---
.../publisher/public/locales/en.json | 23 +++++++++++--
.../AppPublisherBase/BaseLayout.jsx | 8 ++---
.../Application/ApplicationListing.jsx | 4 +--
.../Application/Create/ApplicationCreate.jsx | 17 +++++++---
.../Application/Create/CreateSteps/Step1.jsx | 8 +++--
.../Application/Create/CreateSteps/Step2.jsx | 12 +++++--
.../Application/Create/CreateSteps/Step3.jsx | 12 +++++--
.../Application/Create/CreateSteps/Step4.jsx | 25 ++++++++++----
.../Application/Edit/PackageManager.jsx | 3 +-
.../Release/Create/CreateRelease.jsx | 4 ++-
.../Release/Create/UploadPackage.jsx | 3 +-
.../Application/View/ApplicationView.jsx | 14 ++++++--
.../src/components/Platform/Platform.jsx | 33 +++++++++++++++----
.../components/Platform/PlatformCreate.jsx | 23 +++++++++----
14 files changed, 142 insertions(+), 47 deletions(-)
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/locales/en.json b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/locales/en.json
index 35ec9afc05d..3bc7a828d77 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/locales/en.json
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/public/locales/en.json
@@ -9,22 +9,26 @@
"Groups" : "Groups",
"Tags" : "Tags",
"Platform" : "Platform",
- "Platforms" : "Platfomrs",
+ "Platforms" : "Platforms",
+ "Applications": "Applications",
"No.Platform" : "No Platforms",
"Screenshots" : "Screenshots",
"Icon" : "Icon",
+ "Info" : "Info",
"Banner" : "Banner",
"Create.Application" : "Create Application",
"Back" : "Back",
"Cancel" : "Cancel",
"Finish" : "Finish",
"Continue" : "Continue",
+ "Name" : "Name",
"Application.Name" : "Application Name",
"General" : "General",
"App.Releases" : "Application Releases",
"Package.Manager" : "Package Manager",
"Save" : "Save",
"Create.Release" : "Create Release",
+ "Release.Channel" : "Release Channel",
"Release" : "Release",
"New.Release.For" : "New Release for",
"Upload.Package.File" : "Upload Package File",
@@ -38,5 +42,20 @@
"Alpha.Releases" : "Alpha Releases",
"Version" : "Version",
"Status" : "Status",
- "App.Publisher" : "Application Publisher"
+ "App.Publisher" : "Application Publisher",
+ "Search.Apps" : "Search for Applications",
+ "View.In.Store" : "View in Store",
+ "Last.Updated" : "Last updated on",
+ "Installs" : "Installs",
+ "General.Info" : "General Info",
+ "Select.Platform": "Select Platform",
+ "Add.Release" : "Add Release to Application",
+ "Share.With.Tenants" : "Share with Tenants",
+ "Disable" : "Disable",
+ "File.Based" : "File Based",
+ "Activate" : "Activate",
+ "Yes" : "Yes",
+ "No" : "No",
+ "No.Platform.Tags" : "No Platform Tags",
+ "Create.Platform" : "Create Platform"
}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/AppPublisherBase/BaseLayout.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/AppPublisherBase/BaseLayout.jsx
index cdf1b82a938..464300be20f 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/AppPublisherBase/BaseLayout.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/AppPublisherBase/BaseLayout.jsx
@@ -42,7 +42,7 @@ class BaseLayout extends Component {
this.onClickApplications = this.onClickApplications.bind(this);
this.state = {
notifications: 0,
- user: 'Admin',
+ user: '',
openModal: false,
currentPage: "",
logo: {}
@@ -94,7 +94,7 @@ class BaseLayout extends Component {
if (href.indexOf("apps") !== -1) {
return "Applications";
} else if (href.indexOf("platforms") !== -1) {
- return "Platforms"
+ return "Platforms";
}
}
@@ -162,11 +162,11 @@ class BaseLayout extends Component {
{this.getCurrentPageTitle() === "Applications" ?
:
}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
index f830c880580..1a79b254a1b 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
@@ -21,7 +21,6 @@ import {withRouter} from 'react-router-dom';
import {Button, Col, Row} from 'reactstrap';
import Drawer from '../UIComponents/Drawer/Drawer';
import ApplicationView from './View/ApplicationView';
-import {FormattedMessage} from 'react-intl';
import ApplicationMgtApi from "../../api/applicationMgtApi";
import AuthHandler from "../../api/authHandler";
@@ -249,7 +248,8 @@ class ApplicationListing extends Component {
className="data-table-row-cell">{application.currentLifecycle.lifecycleState.name}
-
- Create a {channel} Release
+ Create
+ a {channel}
+ Release
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/UploadPackage.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/UploadPackage.jsx
index e41bf5a634f..8ffe7bdfdbb 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/UploadPackage.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Release/Create/UploadPackage.jsx
@@ -41,7 +41,8 @@ class UploadPackage extends Component {
{"<-"}
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/View/ApplicationView.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/View/ApplicationView.jsx
index d93a90ee2cc..a2817d4cd32 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/View/ApplicationView.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/View/ApplicationView.jsx
@@ -70,7 +70,9 @@ class ApplicationView extends Component {
{app.name}
- Last updated on {app.modifiedAt}
+
+ {app.modifiedAt}
@@ -78,7 +80,9 @@ class ApplicationView extends Component {
- 2k Installs
+
+ 2k
+
@@ -89,7 +93,11 @@ class ApplicationView extends Component {
- View in Store
+
+
+
+
+
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Platform.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Platform.jsx
index fc1ada106fc..44479434ae5 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Platform.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Platform.jsx
@@ -18,6 +18,7 @@
import React, {Component} from 'react';
import {Button, Col, Collapse, Row} from "reactstrap";
+import {FormattedMessage} from "react-intl";
/**
* Platform component.
@@ -57,8 +58,13 @@ class Platform extends Component {
-
{platform.enabled ? "Disable" : "Activate"}
-
Share With Tenants
+
{platform.enabled ?
+ :
+ }
+
+
+
+
{this.state.isOpen ? : }
@@ -71,23 +77,36 @@ class Platform extends Component {
- Description
+
+
+
{platform.description}
- File Based
+
+
+
- {platform.fileBased ? "Yes" : "No"}
+ {platform.fileBased ?
+
+ : }
- Tags
+
+
+
- {platform.tags.length > 0 ? platform.tags : "No Platform Tags"}
+ {platform.tags.length > 0 ?
+ platform.tags :
+
+ }
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx
index 28460613f39..984cb05d66c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/PlatformCreate.jsx
@@ -16,7 +16,8 @@
* under the License.
*/
import React, {Component} from 'react';
-import {Button, FormGroup, Label, Modal, ModalBody, ModalFooter, ModalHeader, Input} from "reactstrap";
+import {Button, FormGroup, Input, Label, Modal, ModalBody, ModalFooter, ModalHeader} from "reactstrap";
+import {FormattedMessage} from "react-intl";
/**
* Platform view component.
@@ -48,20 +49,30 @@ class PlatformCreate extends Component {
return (
- Create Platform
+
+
+
-
+
-
+
- Cancel
- Create
+
+
+
+
+
+