feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

iOS: Tr::tr

Browse Source 
Change-Id: I547af218546927622414999e5b9019ab62916e7e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2022-12-20 13:39:23 +01:00
parent 8f2d48e8a3
commit 6a1a6d85b8
45 changed files with 365 additions and 1328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/plugins/ios/iosbuildconfiguration.cpp
View File

@@ -5,6 +5,7 @@
#include "iosconfigurations.h"
#include "iosconstants.h"
#include "iostr.h"
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/namedwidget.h>
@@ -82,7 +83,7 @@ private:
IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConfiguration,
BoolAspect *autoManagedSigning,
StringAspect *signingIdentifier)
: NamedWidget(IosQmakeBuildConfiguration::tr("iOS Settings"))
: NamedWidget(Tr::tr("iOS Settings"))
, m_autoManagedSigning(autoManagedSigning)
, m_signingIdentifier(signingIdentifier)
, m_isDevice(DeviceTypeKitAspect::deviceTypeId(buildConfiguration->kit())
@@ -96,7 +97,7 @@ IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConf
sizePolicy.setHorizontalStretch(0);
sizePolicy.setVerticalStretch(0);
m_qmakeDefaults->setSizePolicy(sizePolicy);
m_qmakeDefaults->setText(IosQmakeBuildConfiguration::tr("Reset"));
m_qmakeDefaults->setText(Tr::tr("Reset"));
m_qmakeDefaults->setEnabled(m_isDevice);
m_signEntityCombo = new QComboBox(container);
@@ -111,7 +112,7 @@ IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConf
sizePolicy2.setVerticalStretch(0);
m_autoSignCheckbox->setSizePolicy(sizePolicy2);
m_autoSignCheckbox->setChecked(true);
m_autoSignCheckbox->setText(IosQmakeBuildConfiguration::tr("Automatically manage signing"));
m_autoSignCheckbox->setText(Tr::tr("Automatically manage signing"));
m_autoSignCheckbox->setChecked(m_autoManagedSigning->value());
m_autoSignCheckbox->setEnabled(m_isDevice);
@@ -121,7 +122,7 @@ IosSigningSettingsWidget::IosSigningSettingsWidget(BuildConfiguration *buildConf
m_warningLabel = new Utils::InfoLabel({}, Utils::InfoLabel::Warning, container);
m_signEntityLabel->setText(IosQmakeBuildConfiguration::tr("Development team:"));
m_signEntityLabel->setText(Tr::tr("Development team:"));
connect(m_qmakeDefaults, &QPushButton::clicked, this, &IosSigningSettingsWidget::onReset);
@@ -216,8 +217,8 @@ void IosSigningSettingsWidget::onReset()
void IosSigningSettingsWidget::configureSigningUi(bool autoManageSigning)
{
m_signEntityLabel->setText(autoManageSigning
? IosQmakeBuildConfiguration::tr("Development team:")
: IosQmakeBuildConfiguration::tr("Provisioning profile:"));
? Tr::tr("Development team:")
: Tr::tr("Provisioning profile:"));
if (autoManageSigning)
populateDevelopmentTeams();
else
@@ -242,7 +243,7 @@ void IosSigningSettingsWidget::populateDevelopmentTeams()
QSignalBlocker blocker(m_signEntityCombo);
// Populate Team id's
m_signEntityCombo->clear();
m_signEntityCombo->addItem(IosQmakeBuildConfiguration::tr("Default"));
m_signEntityCombo->addItem(Tr::tr("Default"));
const auto teams = IosConfigurations::developmentTeams();
for (auto team : teams) {
m_signEntityCombo->addItem(team->displayName());
@@ -271,7 +272,7 @@ void IosSigningSettingsWidget::populateProvisioningProfiles()
m_signEntityCombo->setItemData(index, profile->details(), Qt::ToolTipRole);
}
} else {
m_signEntityCombo->addItem(IosQmakeBuildConfiguration::tr("None"));
m_signEntityCombo->addItem(Tr::tr("None"));
}
}
// Maintain previous selection.
@@ -302,12 +303,11 @@ void IosSigningSettingsWidget::updateInfoText()
if (identifier.isEmpty()) {
// No signing entity selection.
if (configuringTeams)
addMessage(IosQmakeBuildConfiguration::tr("Development team is not selected."));
addMessage(Tr::tr("Development team is not selected."));
else
addMessage(IosQmakeBuildConfiguration::tr("Provisioning profile is not selected."));
addMessage(Tr::tr("Provisioning profile is not selected."));
addMessage(IosQmakeBuildConfiguration::tr(
"Using default development team and provisioning profile."));
addMessage(Tr::tr("Using default development team and provisioning profile."));
} else {
if (!configuringTeams) {
ProvisioningProfilePtr profile = IosConfigurations::provisioningProfile(identifier);
@@ -315,17 +315,15 @@ void IosSigningSettingsWidget::updateInfoText()
auto team = profile->developmentTeam();
if (team) {
// Display corresponding team information.
addMessage(IosQmakeBuildConfiguration::tr("Development team: %1 (%2)")
addMessage(Tr::tr("Development team: %1 (%2)")
.arg(team->displayName())
.arg(team->identifier()));
addMessage(IosQmakeBuildConfiguration::tr(
"Settings defined here override the QMake environment."));
addMessage(Tr::tr("Settings defined here override the QMake environment."));
} else {
qCDebug(iosSettingsLog) << "Development team not found for profile" << profile;
}
} else {
addMessage(IosQmakeBuildConfiguration::tr(
"Settings defined here override the QMake environment."));
addMessage(Tr::tr("Settings defined here override the QMake environment."));
}
}
@@ -341,24 +339,23 @@ void IosSigningSettingsWidget::updateWarningText()
QString warningText;
bool configuringTeams = m_autoSignCheckbox->isChecked();
if (m_signEntityCombo->count() < 2) {
warningText = IosQmakeBuildConfiguration::tr("%1 not configured. Use Xcode and Apple "
"developer account to configure the "
"provisioning profiles and teams.")
warningText = Tr::tr("%1 not configured. Use Xcode and Apple "
"developer account to configure the "
"provisioning profiles and teams.")
.arg(configuringTeams
? IosQmakeBuildConfiguration::tr("Development teams")
: IosQmakeBuildConfiguration::tr("Provisioning profiles"));
? Tr::tr("Development teams")
: Tr::tr("Provisioning profiles"));
} else {
QString identifier = selectedIdentifier();
if (configuringTeams) {
auto team = IosConfigurations::developmentTeam(identifier);
if (team && !team->hasProvisioningProfile())
warningText = IosQmakeBuildConfiguration::tr(
"No provisioning profile found for the selected team.");
warningText = Tr::tr("No provisioning profile found for the selected team.");
} else {
auto profile = IosConfigurations::provisioningProfile(identifier);
if (profile && QDateTime::currentDateTimeUtc() > profile->expirationDate()) {
warningText
= IosQmakeBuildConfiguration::tr(
= Tr::tr(
"Provisioning profile expired. Expiration date: %1")
.arg(QLocale::system().toString(profile->expirationDate().toLocalTime(),
QLocale::LongFormat));