ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Lots of J's for Java needed to be uppercased

Browse Source
This commit is contained in:
Cart 2024-09-26 01:58:21 -04:00
parent 3e60713257
commit 6475dc5786
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
launcher/VersionProxyModel.cpp
View File

@ -140,9 +140,9 @@ QVariant VersionProxyModel::headerData(int section, Qt::Orientation orientation,
case Path: case Path:
return tr("Filesystem path to this version"); return tr("Filesystem path to this version");
case JavaName: case JavaName:
return tr("The alternative name of the java version"); return tr("The alternative name of the Java version");
case JavaMajor: case JavaMajor:
return tr("The java major version"); return tr("The Java major version");
case Time: case Time:
return tr("Release date of this version"); return tr("Release date of this version");
} }

2
launcher/java/download/ArchiveDownloadTask.cpp
View File

@ -65,7 +65,7 @@ void ArchiveDownloadTask::executeTask()
void ArchiveDownloadTask::extractJava(QString input) void ArchiveDownloadTask::extractJava(QString input)
{ {
setStatus(tr("Extracting java")); setStatus(tr("Extracting Java"));
if (input.endsWith("tar")) { if (input.endsWith("tar")) {
setStatus(tr("Extracting Java (Progress is not reported for tar archives)")); setStatus(tr("Extracting Java (Progress is not reported for tar archives)"));
QFile in(input); QFile in(input);

2
launcher/ui/MainWindow.ui
View File

@ -798,7 +798,7 @@
<string>Java</string> <string>Java</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Open the java folder in a file browser. Only available if the built-in Java downloader is used.</string> <string>Open the Java folder in a file browser. Only available if the built-in Java downloader is used.</string>
</property> </property>
</action> </action>
</widget> </widget>

8
launcher/ui/java/InstallJavaDialog.cpp
View File

@ -57,13 +57,13 @@ class InstallJavaPage : public QWidget, public BasePage {
majorVersionSelect = new VersionSelectWidget(this); majorVersionSelect = new VersionSelectWidget(this);
majorVersionSelect->selectCurrent(); majorVersionSelect->selectCurrent();
majorVersionSelect->setEmptyString(tr("No java versions are currently available in the meta.")); majorVersionSelect->setEmptyString(tr("No Java versions are currently available in the meta."));
majorVersionSelect->setEmptyErrorString(tr("Couldn't load or download the java version lists!")); majorVersionSelect->setEmptyErrorString(tr("Couldn't load or download the Java version lists!"));
horizontalLayout->addWidget(majorVersionSelect, 1); horizontalLayout->addWidget(majorVersionSelect, 1);
javaVersionSelect = new VersionSelectWidget(this); javaVersionSelect = new VersionSelectWidget(this);
javaVersionSelect->setEmptyString(tr("No java versions are currently available for your OS.")); javaVersionSelect->setEmptyString(tr("No Java versions are currently available for your OS."));
javaVersionSelect->setEmptyErrorString(tr("Couldn't load or download the java version lists!")); javaVersionSelect->setEmptyErrorString(tr("Couldn't load or download the Java version lists!"));
horizontalLayout->addWidget(javaVersionSelect, 4); horizontalLayout->addWidget(javaVersionSelect, 4);
connect(majorVersionSelect, &VersionSelectWidget::selectedVersionChanged, this, &InstallJavaPage::setSelectedVersion); connect(majorVersionSelect, &VersionSelectWidget::selectedVersionChanged, this, &InstallJavaPage::setSelectedVersion);
connect(majorVersionSelect, &VersionSelectWidget::selectedVersionChanged, this, &InstallJavaPage::selectionChanged); connect(majorVersionSelect, &VersionSelectWidget::selectedVersionChanged, this, &InstallJavaPage::selectionChanged);

4
launcher/ui/pages/global/JavaPage.cpp
View File

@ -67,8 +67,8 @@ JavaPage::JavaPage(QWidget* parent) : QWidget(parent), ui(new Ui::JavaPage)
ui->managedJavaList->initialize(new JavaInstallList(this, true)); ui->managedJavaList->initialize(new JavaInstallList(this, true));
ui->managedJavaList->setResizeOn(2); ui->managedJavaList->setResizeOn(2);
ui->managedJavaList->selectCurrent(); ui->managedJavaList->selectCurrent();
ui->managedJavaList->setEmptyString(tr("No managed java versions are installed")); ui->managedJavaList->setEmptyString(tr("No managed Java versions are installed"));
ui->managedJavaList->setEmptyErrorString(tr("Couldn't load the managed java list!")); ui->managedJavaList->setEmptyErrorString(tr("Couldn't load the managed Java list!"));
connect(ui->autodetectJavaCheckBox, &QCheckBox::stateChanged, this, [this] { connect(ui->autodetectJavaCheckBox, &QCheckBox::stateChanged, this, [this] {
ui->autodownloadCheckBox->setEnabled(ui->autodetectJavaCheckBox->isChecked()); ui->autodownloadCheckBox->setEnabled(ui->autodetectJavaCheckBox->isChecked());
if (!ui->autodetectJavaCheckBox->isChecked()) if (!ui->autodetectJavaCheckBox->isChecked())

2
launcher/ui/setupwizard/AutoJavaWizardPage.ui
View File

@ -30,7 +30,7 @@
<item> <item>
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>We've added a feature to automatically download the correct Java version for each version of Minecraft(this can be changed in the Java Settings). Would you like to enable or disable this feature?</string> <string>We've added a feature to automatically download the correct Java version for each version of Minecraft (this can be changed in the Java Settings). Would you like to enable or disable this feature?</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

2
launcher/ui/setupwizard/JavaWizardPage.cpp
View File

@ -83,6 +83,6 @@ void JavaWizardPage::retranslate()
{ {
setTitle(tr("Java")); setTitle(tr("Java"));
setSubTitle( setSubTitle(
tr("Please select how much memory to allocate to instances and if Prism Launcher should manage java automatically or manually.")); tr("Please select how much memory to allocate to instances and if Prism Launcher should manage Java automatically or manually."));
m_java_widget->retranslate(); m_java_widget->retranslate();
} }