Skip to content

Commit

Permalink
Qt: Add es-es locale
Browse files Browse the repository at this point in the history
  • Loading branch information
stenzek committed Apr 4, 2022
1 parent 748a75e commit 948b435
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 11 deletions.
1 change: 1 addition & 0 deletions src/duckstation-qt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ set(TS_FILES
translations/duckstation-qt_de.ts
translations/duckstation-qt_en.ts
translations/duckstation-qt_es.ts
translations/duckstation-qt_es-es.ts
translations/duckstation-qt_fr.ts
translations/duckstation-qt_he.ts
translations/duckstation-qt_it.ts
Expand Down
11 changes: 2 additions & 9 deletions src/duckstation-qt/duckstation-qt.vcxproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\dep\msvc\vsprops\Configurations.props" />

<ItemGroup>
<ClCompile Include="aboutdialog.cpp" />
<ClCompile Include="achievementsettingswidget.cpp" />
Expand Down Expand Up @@ -255,6 +254,7 @@
</QtTs>
</ItemGroup>
<ItemGroup>
<None Include="translations\duckstation-qt_es-es.ts" />
<None Include="translations\duckstation-qt_tr.ts" />
<QtUi Include="achievementsettingswidget.ui">
<FileType>Document</FileType>
Expand All @@ -264,7 +264,6 @@
</QtUi>
<None Include="debuggerwindow.ui" />
</ItemGroup>

<ItemGroup>
<CommonDataFiles Include="$(SolutionDir)data\**\*.*">
<InProject>false</InProject>
Expand All @@ -274,23 +273,17 @@
<Message Text="Copying common data files" Importance="High" />
<Copy SourceFiles="@(CommonDataFiles)" DestinationFolder="$(BinaryOutputDir)\%(RecursiveDir)" SkipUnchangedFiles="true" />
</Target>

<PropertyGroup Label="Globals">
<ProjectGuid>{28F14272-0EC4-41BB-849F-182ADB81AF70}</ProjectGuid>
</PropertyGroup>

<Import Project="..\..\dep\msvc\vsprops\Win32Application.props" />
<Import Project="..\..\dep\msvc\vsprops\QtCompile.props" />

<Import Project="..\frontend-common\frontend-common.props" />

<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>$(RootBuildDir)frontend-common\frontend-common.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>

<Import Project="..\..\dep\msvc\vsprops\Targets.props" />

<Import Project="..\..\dep\msvc\vsprops\QtCompile.targets" />
</Project>
</Project>
3 changes: 3 additions & 0 deletions src/duckstation-qt/duckstation-qt.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@
<None Include="translations\duckstation-qt_tr.ts">
<Filter>translations</Filter>
</None>
<None Include="translations\duckstation-qt_es-es.ts">
<Filter>translations</Filter>
</None>
</ItemGroup>
<ItemGroup>
<QtTs Include="translations\duckstation-qt_de.ts">
Expand Down
12 changes: 11 additions & 1 deletion src/duckstation-qt/mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,17 @@ void MainWindow::setupAdditionalUi()
QAction* action = language_group->addAction(it.first);
action->setCheckable(true);
action->setChecked(current_language == it.second);
action->setIcon(QIcon(QStringLiteral(":/icons/flags/%1.png").arg(it.second)));

QString icon_filename(QStringLiteral(":/icons/flags/%1.png").arg(it.second));
if (!QFile::exists(icon_filename))
{
// try without the suffix (e.g. es-es -> es)
const int pos = it.second.lastIndexOf('-');
if (pos >= 0)
icon_filename = QStringLiteral(":/icons/flags/%1.png").arg(it.second.left(pos));
}
action->setIcon(QIcon(icon_filename));

m_ui.menuSettingsLanguage->addAction(action);
action->setData(it.second);
connect(action, &QAction::triggered, [this, action]() {
Expand Down
3 changes: 2 additions & 1 deletion src/duckstation-qt/qthostinterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ std::vector<std::pair<QString, QString>> QtHostInterface::getAvailableLanguageLi
{
return {{QStringLiteral("English"), QStringLiteral("en")},
{QStringLiteral("Deutsch"), QStringLiteral("de")},
{QStringLiteral("Español"), QStringLiteral("es")},
{QStringLiteral("español de Hispanoamérica"), QStringLiteral("es")},
{QStringLiteral("español de España"), QStringLiteral("es-es")},
{QStringLiteral("Français"), QStringLiteral("fr")},
{QStringLiteral("עברית"), QStringLiteral("he")},
{QStringLiteral("日本語"), QStringLiteral("ja")},
Expand Down

0 comments on commit 948b435

Please sign in to comment.