Small code clean-up.

This commit is contained in:
LoRd_MuldeR 2012-10-15 00:41:38 +02:00
parent e0624e7c45
commit 61d440303b
5 changed files with 6 additions and 5 deletions

View File

@ -45,6 +45,7 @@ Only language files that have been edited according to the following rules can b
<h3>Submitting your translation:</h3>
<p>Once you are done with your translation (i.e. all items and all contexts have a green <font style="color:darkgreen">&#10004;</font> icon), you can submit it, so it can be integrated into the next LameXP release. You can contact me by e-mail:<br><b><a href="mailto:mulder2%20[at]%20gmx%20[dot]%20de">mulder2<font color="dimgray">[at]</font>gmx<font color="dimgray">[dot]</font>de</a></b></p>
<p>Please do <i>not</i> submit translations that have any items/context with <font style="color:#AA8B0F">&#10004;</font>, <font style="color:#AA8B0F;font-weight:bold">?</font>, <font style="color:#427D7E;font-weight:bold">?</font> or even <font style="color:darkred;font-weight:bold">!</font> icon left. Also do <i>not</i> submit QM files, do <i>not</i> compress the submitted file (ZIP, RAR, etc) and do <i>not</i> attach a flag icon file. It is sufficient to submit the translation (TS) file.</p>
<p><b><i>Legal notice:</i></b> By submitting LameXP translations, all translators agree that their work will be incorporated into the LameXP software and, from then on, will be published and redistributed under the terms of the GNU General Public License. If you do <i>not</i> agree, please do <i>not</i> submit!
<p>(Note: Advanced translators can get write-access to the Git repository on request, so they can keep their translations up-to-date easily)</p>
<p style="border-width:2px;border-style:solid;border-color:darkred;margin-top:2em"><font color="darkred"><b>IMPORTANT:</b> Before you start to create a new translation, always make sure you downloaded the <i>latest</i> "Blank.ts" file from the LameXP Git repository. Also before you start editing or updating an <i>existing</i> translation, including translations you have created yourself, make sure you downloaded the <i>latest</i> TS file from the LameXP Git repository. <i>Never</i> do any translations based on an old working copy (TS file) from your local system! The translation files (TS) in the Git repository will be updated/extended continuously, as the development proceeds. We cannot accept translations based on an <i>outdated</i> TS file!</font></p>
<br>

View File

@ -285,7 +285,7 @@
</message>
<message>
<source>UPX - The Ultimate Packer for eXecutables</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
</context>
<context>

View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 6
#define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 3
#define VER_LAMEXP_BUILD 1150
#define VER_LAMEXP_BUILD 1151
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)

View File

@ -818,7 +818,7 @@ void MainWindow::initializeTranslation(void)
if(!m_settings->currentLanguageFile().isEmpty())
{
const QString qmFilePath = QFileInfo(m_settings->currentLanguageFile()).canonicalFilePath();
if(QFileInfo(qmFilePath).exists() && QFileInfo(qmFilePath).isFile() && (QFileInfo(qmFilePath).suffix().compare("qm", Qt::CaseInsensitive) == 0))
if((!qmFilePath.isEmpty()) && QFileInfo(qmFilePath).exists() && QFileInfo(qmFilePath).isFile() && (QFileInfo(qmFilePath).suffix().compare("qm", Qt::CaseInsensitive) == 0))
{
if(lamexp_install_translator_from_file(qmFilePath))
{

View File

@ -254,9 +254,9 @@ void SettingsModel::validate(void)
if(!this->currentLanguageFile().isEmpty())
{
const QString qmPath = QFileInfo(this->currentLanguageFile()).canonicalFilePath();
if(!(QFileInfo(qmPath).exists() && QFileInfo(qmPath).isFile() && (QFileInfo(qmPath).suffix().compare("qm", Qt::CaseInsensitive) == 0)))
if(qmPath.isEmpty() || (!(QFileInfo(qmPath).exists() && QFileInfo(qmPath).isFile() && (QFileInfo(qmPath).suffix().compare("qm", Qt::CaseInsensitive) == 0))))
{
qWarning("Current language file \"%s\" missing, reverting to built-in translator!", qmPath.toUtf8().constData());
qWarning("Current language file missing, reverting to built-in translator!");
this->currentLanguageFile(QString());
}
}