Merge lp:~alexwolf/stellarium/MeteorShowers-translations-patches into lp:~cardinot/stellarium/MeteorShowers

[Alexander Wolf]

Few patches for improvement search tool and translations

[Marcos Cardinot (cardinot)]

review: Approve

=== modified file 'plugins/MeteorShowers/src/CMakeLists.txt'
--- plugins/MeteorShowers/src/CMakeLists.txt	2013-12-05 23:32:18 +0000
+++ plugins/MeteorShowers/src/CMakeLists.txt	2013-12-22 09:51:09 +0000
@@ -16,7 +16,6 @@
     MeteorStream.cpp
     gui/MeteorShowerDialog.hpp
     gui/MeteorShowerDialog.cpp
-    translations.h
 )
 
 SET(MeteorShowersDialog_UIS

=== modified file 'plugins/MeteorShowers/src/MeteorShowers.cpp'
--- plugins/MeteorShowers/src/MeteorShowers.cpp	2013-12-16 16:46:13 +0000
+++ plugins/MeteorShowers/src/MeteorShowers.cpp	2013-12-22 09:51:09 +0000
@@ -569,10 +569,9 @@
 	if(!flagShowMS)
 		return NULL;
 
-	QString objw = englishName.toUpper();
 	foreach(const MeteorShowerP& ms, mShowers)
 	{
-		if(ms->getEnglishName().toUpper() == englishName)
+		if(ms->getEnglishName().toUpper() == englishName.toUpper())
 			return qSharedPointerCast<StelObject>(ms);
 	}
 
@@ -586,7 +585,7 @@
 
 	foreach(const MeteorShowerP& ms, mShowers)
 	{
-		if(ms->getNameI18n().toUpper() == nameI18n)
+		if(ms->getNameI18n().toUpper() == nameI18n.toUpper())
 			return qSharedPointerCast<StelObject>(ms);
 	}
 
@@ -602,18 +601,33 @@
 	if(maxNbItem==0)
 		return result;
 
-	QString objw = objPrefix.toUpper();
+	QString sn;
+	bool find;
 
 	foreach(const MeteorShowerP& ms, mShowers)
 	{
-		if(ms->getNameI18n().toUpper().left(objw.length()) == objw)
-		{
-			result << ms->getNameI18n().toUpper();
-		}
+		sn = ms->getNameI18n();
+		find = false;
+		if (useStartOfWords)
+		{
+			if (sn.toUpper().left(objPrefix.length()) == objPrefix.toUpper())
+				find = true;
+		}
+		else
+		{
+			if (sn.contains(objPrefix, Qt::CaseInsensitive))
+				find = true;
+		}
+		if (find)
+			result << sn;
+
+
 	}
 
 	result.sort();
-	if(result.size()>maxNbItem) result.erase(result.begin()+maxNbItem, result.end());
+
+	if(result.size()>maxNbItem)
+		result.erase(result.begin()+maxNbItem, result.end());
 
 	return result;
 }
@@ -992,3 +1006,104 @@
 		GETSTELMODULE(LabelMgr)->deleteLabel(i);
 	}
 }
+
+void MeteorShowers::translations()
+{
+#if 0
+	// Meteor showers
+	// TRANSLATORS: Name of meteor shower
+	N_("Quadrantids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Lyrids");
+	// TRANSLATORS: Name of meteor shower
+	N_("α-Centaurids");
+	// TRANSLATORS: Name of meteor shower
+	N_("γ-Normids");
+	// TRANSLATORS: Name of meteor shower
+	N_("η-Aquariids");
+	// TRANSLATORS: Name of meteor shower
+	N_("June Bootids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Piscis Austrinids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Southern δ-Aquariids");
+	// TRANSLATORS: Name of meteor shower
+	N_("α-Capricornids");
+	// TRANSLATORS: Name of meteor shower
+	N_("α-Aurigids");
+	// TRANSLATORS: Name of meteor shower
+	N_("September ε-Perseids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Draconids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Leonids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Phoenicids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Puppid-Velids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Ursids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Perseids");
+	// TRANSLATORS: Name of meteor shower
+	N_("δ-Leonids");
+	// TRANSLATORS: Name of meteor shower
+	N_("π-Puppids");
+	// TRANSLATORS: Name of meteor shower
+	N_("June Lyrids");
+	// TRANSLATORS: Name of meteor shower
+	N_("κ-Cygnids");
+	// TRANSLATORS: Name of meteor shower
+	N_("ε-Lyrids");
+	// TRANSLATORS: Name of meteor shower
+	N_("δ-Aurigids");
+	// TRANSLATORS: Name of meteor shower
+	N_("ε-Geminids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Southern Taurids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Northern Taurids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Monocerotids");
+	// TRANSLATORS: Name of meteor shower
+	N_("σ-Hydrids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Geminids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Leonis Minorids");
+	// TRANSLATORS: Name of meteor shower
+	N_("December Leonis Minorids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Comae Berenicids");
+	// TRANSLATORS: Name of meteor shower
+	N_("Orionids");
+
+	// List of parent objects for meteor showers
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Asteroid 2003 EH1");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 1P/Halley");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 7P/Pons-Winnecke");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 55P/Tempel-Tuttle");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 96P/Machholz");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 109P/Swift-Tuttle");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet Thatcher (1861 I)");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Asteroid (4450) Pan");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 26P/Grigg-Skjellerup");
+	// TRANSLATORS: Name of parent object for meteor shower
+	N_("Comet 21P/Giacobini-Zinner");
+
+	/* For copy/paste:
+	// TRANSLATORS: Name of meteor shower
+	N_("");
+	*/
+
+#endif
+}

=== modified file 'plugins/MeteorShowers/src/MeteorShowers.hpp'
--- plugins/MeteorShowers/src/MeteorShowers.hpp	2013-12-15 06:30:02 +0000
+++ plugins/MeteorShowers/src/MeteorShowers.hpp	2013-12-22 09:51:09 +0000
@@ -243,6 +243,12 @@
 	//! Set items for list of struct from data map
 	void setShowersMap(const QVariantMap& map);
 
+	//! A fake method for strings marked for translation.
+	//! Use it instead of translations.h for N_() strings, except perhaps for
+	//! keyboard action descriptions. (It's better for them to be in a single
+	//! place.)
+	static void translations();
+
 	//! Font used for displaying our text
 	QFont font;
 

=== modified file 'plugins/MeteorShowers/src/gui/MeteorShowerDialog.cpp'
--- plugins/MeteorShowers/src/gui/MeteorShowerDialog.cpp	2013-12-11 21:08:30 +0000
+++ plugins/MeteorShowers/src/gui/MeteorShowerDialog.cpp	2013-12-22 09:51:09 +0000
@@ -68,8 +68,8 @@
 void MeteorShowerDialog::createDialogContent()
 {
 	ui->setupUi(dialog);
-	ui->tabs->setCurrentIndex(0);
-	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(languageChanged()));
+	ui->tabs->setCurrentIndex(0);	
+	connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
 
 	// Settings tab / updates group
 	ui->displayModeCheckBox->setChecked(GETSTELMODULE(MeteorShowers)->getFlagShowMS());

=== removed file 'plugins/MeteorShowers/src/translations.h'
--- plugins/MeteorShowers/src/translations.h	2013-12-14 12:02:59 +0000
+++ plugins/MeteorShowers/src/translations.h	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * Stellarium
- * Copyright (C) 2013 Marcos Cardinot
- * Copyright (C) 2011 Alexander Wolf
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-class MeteorShowerTranslations
-{
-	void MeteorShowerTranslations()
-	{
-		;
-	}
-
-	static translationShowerList()
-	{
-		// Generate Gettext strings for traduction
-		Q_ASSERT(0);
-
-		// Meteor showers from catalog (showers.json)
-		N_("Quadrantids");
-		N_("Lyrids");
-		N_("α-Centaurids");
-		N_("γ-Normids");
-		N_("η-Aquariids");
-		N_("June Bootids");
-		N_("Piscis Austrinids");
-		N_("Southern δ-Aquariids");
-		N_("α-Capricornids");
-		N_("α-Aurigids");
-		N_("September ε-Perseids");
-		N_("Draconids");
-		N_("Leonids");
-		N_("Phoenicids");
-		N_("Puppid-Velids");
-		N_("Ursids");
-		N_("Perseids");
-		N_("δ-Leonids");
-		N_("π-Puppids");
-		N_("June Lyrids");
-		N_("κ-Cygnids");
-		N_("ε-Lyrids");
-		N_("δ-Aurigids");
-		N_("ε-Geminids");
-		N_("Southern Taurids");
-		N_("Northern Taurids");
-		N_("Monocerotids");
-		N_("σ-Hydrids");
-		N_("Geminids");
-		N_("Leonis Minorids");
-		N_("December Leonis Minorids");
-		N_("Comae Berenicids");
-		N_("Orionids");
-
-		// List of parent objects for meteor showers
-		N_("Asteroid 2003 EH1");
-		N_("Comet 1P/Halley");
-		N_("Comet 7P/Pons-Winnecke");
-		N_("Comet 55P/Tempel-Tuttle");
-		N_("Comet 96P/Machholz");
-		N_("Comet 109P/Swift-Tuttle");
-		N_("Comet Thatcher (1861 I)");
-		N_("Asteroid (4450) Pan");
-		N_("Comet 26P/Grigg-Skjellerup");
-	}
-};

=== modified file 'po/stellarium/POTFILES.in'
--- po/stellarium/POTFILES.in	2013-10-26 09:16:43 +0000
+++ po/stellarium/POTFILES.in	2013-12-22 09:51:09 +0000
@@ -107,3 +107,7 @@
 plugins/Observability/src/Observability.cpp
 plugins/Observability/src/gui/ObservabilityDialog.cpp
 plugins/Observability/src/ui_ObservabilityDialog.h
+plugins/MeteorShowers/src/MeteorShowers.cpp
+plugins/MeteorShowers/src/MeteorShower.cpp
+plugins/MeteorShowers/src/gui/MeteorShowerDialog.cpp
+plugins/MeteorShowers/src/ui_meteorShowerDialog.h