midou/citra-shitamoto-network
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Camera translation (#3747)

Browse Source 
* citra_qt: correct spelling in configuration

* citra_qt/camera: Changed the order of the translation

The translation may not correspond to "couln't load" and "the camera", so create two cases which can get translated individually.
Also add a space after "the camera".

* citra_qt/camera: use the same syntax for the filter in "still_image_camera.cpp" as in "configure_camera.cpp"

* citra_qt/camera: the config should only get added if it's not empty
This commit is contained in:
Christoph 2018-05-19 11:03:06 +02:00 committed by Weiyi Wang
parent e35c634fc6
commit 3bf924cd20
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/citra_qt/camera/qt_camera_factory.cpp
View File

@ -14,10 +14,10 @@ std::unique_ptr<CameraInterface> QtCameraFactory::CreatePreview(const std::strin
if (camera->IsPreviewAvailable()) { if (camera->IsPreviewAvailable()) {
return camera; return camera;
} }
QMessageBox::critical(nullptr, QObject::tr("Error"), QMessageBox::critical(
QObject::tr("Couldn't load ") + nullptr, QObject::tr("Error"),
(config.empty() ? QObject::tr("the camera") : "") + (config.empty() ? QObject::tr("Couldn't load the camera")
QString::fromStdString(config)); : QObject::tr("Couldn't load %1").arg(QString::fromStdString(config))));
return nullptr; return nullptr;
} }

2
src/citra_qt/camera/still_image_camera.cpp
View File

@ -52,7 +52,7 @@ const std::string StillImageCameraFactory::getFilePath() {
temp_filters << QString("*." + QString(type)); temp_filters << QString("*." + QString(type));
} }
QString filter = QObject::tr("Supported image files (") + temp_filters.join(" ") + ")"; QString filter = QObject::tr("Supported image files (%1)").arg(temp_filters.join(" "));
return QFileDialog::getOpenFileName(nullptr, QObject::tr("Open File"), ".", filter) return QFileDialog::getOpenFileName(nullptr, QObject::tr("Open File"), ".", filter)
.toStdString(); .toStdString();

2
src/citra_qt/configuration/configure_camera.ui
View File

@ -117,7 +117,7 @@
<item> <item>
<widget class="QLabel" name="image_source_label"> <widget class="QLabel" name="image_source_label">
<property name="toolTip"> <property name="toolTip">
<string>Select where the image of the emulated camera come from. It may be an image or a real camera.</string> <string>Select where the image of the emulated camera comes from. It may be an image or a real camera.</string>
</property> </property>
<property name="text"> <property name="text">
<string>Camera Image Source:</string> <string>Camera Image Source:</string>