Build multilingual cultural labels RTL-aware

Author: gzotti

src/core/StelSkyCultureMgr.cpp

@@ -977,7 +977,11 @@ QString StelSkyCultureMgr::createCulturalLabel(const StelObject::CulturalName &c
 					       const QString &commonNameI18n,
 					       const QString &abbrevI18n) const
 {
-	// Each element may be in an RTL language (e.g. Arab). However, we want a canonical order of left to right elements.
+	// rtl tracks the right-to-left status of the text in the current position.
+	const bool rtl = StelApp::getInstance().getLocaleMgr().isSkyRTL();
+	// Each element may be in an RTL language (e.g. Arab). However,
+	// - for most (left-to-right) languages we want a canonical order of left to right elements.
+	// - for Arab and other right-to-left user languages, we set a canonical order of right-to-left elements.
 	// This requires building Unicode isolation cells.
 	// Unicode constants from Unicode Standard Annex #9, section 2.
 	//static const QString LRE{"\u202a"}; // Left-to-right embedding: Treat following text as embedded left-to-right
@@ -1082,11 +1086,24 @@ QString StelSkyCultureMgr::createCulturalLabel(const StelObject::CulturalName &c
 	braced.removeOne(QString());
 	braced.removeOne(label); // avoid repeating the main thing if it was used as fallback!
 
-	if (!braced.isEmpty()) label.append(QString(" %1%3%2").arg(QChar(0x2997), QChar(0x2998), braced.join(", ")));
+	if (!braced.isEmpty())
+	{
+		QString pronTrans=QString(" %1%3%2").arg(QChar(0x2997), QChar(0x2998), braced.join(", "));
+		if (rtl)
+			label.prepend(pronTrans);
+		else
+			label.append(pronTrans);
+	}
 
 	// Add IPA (where possible)
 	if ((styleInt & int(StelObject::CulturalDisplayStyle::IPA)) && (!lName.IPA.isEmpty()) && (label != lName.IPA))
-		label.append(QString(" [%1]").arg(lName.IPA));
+	{
+		QString ipa=QString(" [%1]").arg(lName.IPA);
+		if (rtl)
+			label.prepend(ipa);
+		else
+			label.append(ipa);
+	}
 
 	// Add translation and optional byname in brackets
 
@@ -1104,12 +1121,24 @@ QString StelSkyCultureMgr::createCulturalLabel(const StelObject::CulturalName &c
 	if ( (styleInt & int(StelObject::CulturalDisplayStyle::Byname)) && (!lName.bynameI18n.isEmpty()))
 		bracketed.append(lName.bynameI18n);
 	if (!bracketed.isEmpty())
-		label.append(QString(" (%1)").arg(bracketed.join(", ")));
+	{
+		QString transBy=QString(" (%1)").arg(bracketed.join(", "));
+		if (rtl)
+			label.prepend(transBy);
+		else
+			label.append(transBy);
+	}
 
 
 	// Add an explanatory modern name in decorative angle brackets
 	if ((styleInt & int(StelObject::CulturalDisplayStyle::Modern)) && (!commonNameI18n.isEmpty()) && (!label.startsWith(lCommonNameI18n)) && (lCommonNameI18n!=lName.translatedI18n))
-		label.append(QString(" %1%3%2").arg(QChar(0x29FC), QChar(0x29FD), lCommonNameI18n));
+	{
+		QString modern=QString(" %1%3%2").arg(QChar(0x29FC), QChar(0x29FD), lCommonNameI18n);
+		if (rtl)
+			label.prepend(modern);
+		else
+			label.append(modern);
+	}
 	if ((styleInt & int(StelObject::CulturalDisplayStyle::Modern)) && label.isEmpty()) // if something went wrong?
 		label=lCommonNameI18n;