From 2f02da1c95ad73ee0a3f64a9ff600ecf0093ce35 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Sun, 31 May 2020 10:39:20 +0530 Subject: [PATCH] config: automatic translation key migration (#370) The new convention used: - All lower keys - Most keys start with `label.` prefix - All spaces and underscores replaced with `.` Quick ugly hack and similar for config `title`: > IFS=$'\n' > git grep -l "\$t('" | grep -v -e "\$t('label\." -e "\$t('message" -e "\$t('error" > ftr > for f in $(cat ftr); do echo $f; for w in $(grep -Po '\$t\(\K[^)]*' $f | grep "^'" | grep -v -e ^\'message -e ^\'error -e ^\'label); do echo WORD IS $w; nw=$(echo $w | sed "s/$w/'label\.\L&/g" | sed "s/label\.'/label\./g" | sed "s/ /\./g" | sed "s/_/\./g"); echo $w = $nw; sed -i "s/\$t($w/\$t($nw/g" $f; done; done Signed-off-by: Rohit Yadav --- ui/src/components/header/ProjectMenu.vue | 2 +- ui/src/components/view/DedicateData.vue | 8 +- ui/src/components/view/DedicateDomain.vue | 4 +- ui/src/components/view/DetailsTab.vue | 2 +- ui/src/components/view/InfoCard.vue | 106 ++++++------ ui/src/components/view/ResourceLimitTab.vue | 2 +- ui/src/components/view/ResourceView.vue | 2 +- ui/src/components/view/TreeView.vue | 2 +- ui/src/components/view/VmwareData.vue | 6 +- ui/src/config/section/account.js | 6 +- ui/src/config/section/compute.js | 12 +- ui/src/config/section/config.js | 8 +- ui/src/config/section/domain.js | 8 +- ui/src/config/section/event.js | 4 +- ui/src/config/section/image.js | 12 +- ui/src/config/section/infra.js | 10 +- ui/src/config/section/infra/clusters.js | 6 +- ui/src/config/section/infra/hosts.js | 6 +- ui/src/config/section/infra/ilbvms.js | 2 +- ui/src/config/section/infra/nsp.js | 2 +- ui/src/config/section/infra/phynetworks.js | 10 +- ui/src/config/section/infra/pods.js | 6 +- .../config/section/infra/primaryStorages.js | 6 +- ui/src/config/section/infra/routers.js | 2 +- .../config/section/infra/secondaryStorages.js | 4 +- ui/src/config/section/infra/systemVms.js | 2 +- ui/src/config/section/infra/zones.js | 16 +- ui/src/config/section/network.js | 50 +++--- ui/src/config/section/offering.js | 20 +-- ui/src/config/section/plugin/cloudian.js | 2 +- ui/src/config/section/plugin/quota.js | 8 +- ui/src/config/section/project.js | 2 +- ui/src/config/section/role.js | 4 +- ui/src/config/section/user.js | 2 +- ui/src/locales/en.json | 6 + ui/src/views/AutogenView.vue | 4 +- ui/src/views/compute/AssignInstance.vue | 20 +-- ui/src/views/compute/BackupScheduleWizard.vue | 2 +- .../views/compute/CreateKubernetesCluster.vue | 28 ++-- ui/src/views/compute/CreateSSHKeyPair.vue | 12 +- ui/src/views/compute/DeployVM.vue | 48 +++--- ui/src/views/compute/InstanceHardware.vue | 28 ++-- ui/src/views/compute/KubernetesServiceTab.vue | 34 ++-- ui/src/views/compute/MigrateWizard.vue | 12 +- .../views/compute/ScaleKubernetesCluster.vue | 8 +- .../compute/UpgradeKubernetesCluster.vue | 6 +- .../views/compute/backup/BackupSchedule.vue | 6 +- ui/src/views/compute/backup/FormSchedule.vue | 22 +-- .../compute/wizard/AffinityGroupSelection.vue | 4 +- .../wizard/ComputeOfferingSelection.vue | 6 +- .../views/compute/wizard/ComputeSelection.vue | 6 +- .../compute/wizard/DiskOfferingSelection.vue | 10 +- .../compute/wizard/DiskSizeSelection.vue | 2 +- .../compute/wizard/NetworkConfiguration.vue | 10 +- .../views/compute/wizard/NetworkSelection.vue | 10 +- .../compute/wizard/SshKeyPairSelection.vue | 14 +- .../compute/wizard/TemplateIsoRadioGroup.vue | 8 +- .../compute/wizard/TemplateIsoSelection.vue | 4 +- ui/src/views/dashboard/UsageDashboard.vue | 2 +- ui/src/views/iam/AddLdapAccount.vue | 22 +-- ui/src/views/iam/ChangeUserPassword.vue | 10 +- ui/src/views/iam/SSLCertificateTab.vue | 16 +- .../image/AddKubernetesSupportedVersion.vue | 20 +-- ui/src/views/image/IsoZones.vue | 16 +- ui/src/views/image/RegisterOrUploadIso.vue | 36 ++-- .../views/image/RegisterOrUploadTemplate.vue | 60 +++---- ui/src/views/image/TemplateZones.vue | 16 +- .../UpdateKubernetesSupportedVersion.vue | 10 +- .../image/UpdateTemplateIsoPermissions.vue | 24 +-- ui/src/views/infra/AddPrimaryStorage.vue | 66 ++++---- ui/src/views/infra/AddSecondaryStorage.vue | 30 ++-- ui/src/views/infra/ClusterAdd.vue | 22 +-- ui/src/views/infra/HostAdd.vue | 26 +-- ui/src/views/infra/HostInfoTab.vue | 18 +- ui/src/views/infra/InfraSummary.vue | 6 +- ui/src/views/infra/PodAdd.vue | 18 +- .../views/infra/network/DedicatedVLANTab.vue | 22 +-- .../infra/network/IpRangesTabManagement.vue | 30 ++-- .../views/infra/network/IpRangesTabPublic.vue | 40 ++--- .../infra/network/IpRangesTabStorage.vue | 26 +-- .../views/infra/network/TrafficTypesTab.vue | 4 +- .../views/infra/zone/PhysicalNetworksTab.vue | 10 +- ui/src/views/infra/zone/SystemVmsTab.vue | 12 +- .../infra/zone/ZoneWizardAddResources.vue | 2 +- ui/src/views/network/AclListRulesTab.vue | 50 +++--- .../network/CreateIsolatedNetworkForm.vue | 54 +++--- ui/src/views/network/CreateL2NetworkForm.vue | 36 ++-- ui/src/views/network/CreateNetwork.vue | 6 +- .../views/network/CreateSharedNetworkForm.vue | 106 ++++++------ .../network/CreateVpnCustomerGateway.vue | 44 ++--- ui/src/views/network/EgressRulesTab.vue | 24 +-- ui/src/views/network/EnableStaticNat.vue | 16 +- ui/src/views/network/FirewallRules.vue | 44 ++--- .../network/IngressEgressRuleConfigure.vue | 30 ++-- .../views/network/InternalLBAssignVmForm.vue | 20 +-- .../views/network/InternalLBAssignedVmTab.vue | 4 +- ui/src/views/network/IpAddressesTab.vue | 12 +- ui/src/views/network/LoadBalancing.vue | 54 +++--- ui/src/views/network/PortForwarding.vue | 46 ++--- ui/src/views/network/RoutersTab.vue | 16 +- ui/src/views/network/StaticRoutesTab.vue | 6 +- ui/src/views/network/VpcTab.vue | 46 ++--- ui/src/views/network/VpcTiersTab.vue | 66 ++++---- ui/src/views/offering/AddComputeOffering.vue | 158 +++++++++--------- ui/src/views/offering/AddDiskOffering.vue | 92 +++++----- ui/src/views/offering/AddNetworkOffering.vue | 152 ++++++++--------- ui/src/views/offering/AddVpcOffering.vue | 30 ++-- .../views/offering/ImportBackupOffering.vue | 14 +- .../views/offering/UpdateOfferingAccess.vue | 10 +- ui/src/views/project/AccountsTab.vue | 10 +- .../views/project/InvitationTokenTemplate.vue | 14 +- ui/src/views/project/InvitationsTemplate.vue | 18 +- ui/src/views/storage/CreateVolume.vue | 16 +- ui/src/views/storage/FormSchedule.vue | 28 ++-- ui/src/views/storage/MigrateVolume.vue | 10 +- .../views/storage/RecurringSnapshotVolume.vue | 2 +- ui/src/views/storage/ResizeVolume.vue | 14 +- .../storage/RestoreAttachBackupVolume.vue | 8 +- ui/src/views/storage/ScheduledSnapshots.vue | 10 +- ui/src/views/storage/TakeSnapshot.vue | 14 +- ui/src/views/storage/UploadLocalVolume.vue | 16 +- 121 files changed, 1260 insertions(+), 1254 deletions(-) diff --git a/ui/src/components/header/ProjectMenu.vue b/ui/src/components/header/ProjectMenu.vue index d0a6b4ded84..dc3eb358d28 100644 --- a/ui/src/components/header/ProjectMenu.vue +++ b/ui/src/components/header/ProjectMenu.vue @@ -29,7 +29,7 @@ diff --git a/ui/src/components/view/DedicateData.vue b/ui/src/components/view/DedicateData.vue index b35d6c9b876..9c5a93a9f3b 100644 --- a/ui/src/components/view/DedicateData.vue +++ b/ui/src/components/view/DedicateData.vue @@ -19,15 +19,15 @@
- {{ $t('dedicated') }} + {{ $t('label.dedicated') }}
Yes

- {{ $t('domainid') }}
+ {{ $t('label.domainid') }}
{{ dedicatedDomainId }}

- {{ $t('account') }}
+ {{ $t('label.account') }}
{{ dedicatedAccountId }}

@@ -37,7 +37,7 @@
- {{ $t('dedicated') }} + {{ $t('label.dedicated') }}
No
{{ dedicatedButtonLabel }} diff --git a/ui/src/components/view/DedicateDomain.vue b/ui/src/components/view/DedicateDomain.vue index 5dcf859d6c7..01d730647b2 100644 --- a/ui/src/components/view/DedicateDomain.vue +++ b/ui/src/components/view/DedicateDomain.vue @@ -19,8 +19,8 @@
-

{{ $t('domain') }}*

-

{{ $t('required') }}

+

{{ $t('label.domain') }}*

+

{{ $t('label.required') }}

{{ domain.name }} diff --git a/ui/src/components/view/DetailsTab.vue b/ui/src/components/view/DetailsTab.vue index 418f4ef6044..be553acc3f1 100644 --- a/ui/src/components/view/DetailsTab.vue +++ b/ui/src/components/view/DetailsTab.vue @@ -21,7 +21,7 @@ :dataSource="$route.meta.details">
- {{ item === 'service' ? $t('supportedservices') : $t(item) }} + {{ item === 'service' ? $t('label.supportedservices') : $t('label.' + item) }}
diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue index befda64b93b..279e9c153e3 100644 --- a/ui/src/components/view/InfoCard.vue +++ b/ui/src/components/view/InfoCard.vue @@ -50,10 +50,10 @@ {{ resource.hypervisor }} - {{ $t('haenable') }} + {{ $t('label.haenable') }} - {{ $t('isdynamicallyscalable') }} + {{ $t('label.isdynamicallyscalable') }} {{ resource.scope }} @@ -68,21 +68,21 @@
-
{{ $t('status') }}
+
{{ $t('label.status') }}
{{ resource.state || resource.status }}
-
{{ $t('allocationstate') }}
+
{{ $t('label.allocationstate') }}
{{ resource.allocationstate }}
-
{{ $t('resourcestate') }}
+
{{ $t('label.resourcestate') }}
{{ resource.resourcestate }} @@ -90,7 +90,7 @@
-
{{ $t('id') }}
+
{{ $t('label.id') }}