r21682 by jghali - #14508: Numbered list should be removed from translation

[scribus-commit]

Author: jghali
Date: Tue Dec 27 15:53:24 2016
New Revision: 21682

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21682
Log:
#14508: Numbered list should be removed from translation

Modified:
    trunk/Scribus/scribus/numeration.cpp
    trunk/Scribus/scribus/numeration.h
    trunk/Scribus/scribus/ui/prefs_documentsections.cpp
    trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
    trunk/Scribus/scribus/ui/smpstylewidget.cpp

Modified: trunk/Scribus/scribus/numeration.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21682&path=/trunk/Scribus/scribus/numeration.cpp
==============================================================================
--- trunk/Scribus/scribus/numeration.cpp	(original)
+++ trunk/Scribus/scribus/numeration.cpp	Tue Dec 27 15:53:24 2016
@@ -17,20 +17,20 @@
 	return str;
 }
 
-QStringList getFormatListTr()
+QStringList getFormatList()
 {
 	QStringList list;
-	list << QObject::tr("1, 2, 3, ...")
+	list << QString::fromLatin1("1, 2, 3, ...")
 	     // U+202D...U+202C to force the string to be displayed LTR
-	     << QObject::trUtf8("\u202dÙ¡, Ù¢, Ù£, ...\u202c")
-	     << QObject::tr("i, ii, iii, ...")
-	     << QObject::tr("I, II, III, ...")
-	     << QObject::tr("a, b, c, ...")
-	     << QObject::tr("A, B, C, ...")
-	     << QObject::trUtf8("\u202dأ, ب, ت, ...\u202c")
-	     << QObject::trUtf8("\u202dأ, ب, ج, ...\u202c")
-	     << QObject::tr("*")
-	     << QObject::tr("CJK");
+	     << QString::fromUtf8("\xE2\x80\xADÙ¡, Ù¢, Ù£, ...\xE2\x80\xAC")
+	     << QString::fromLatin1("i, ii, iii, ...")
+	     << QString::fromLatin1("I, II, III, ...")
+	     << QString::fromLatin1("a, b, c, ...")
+	     << QString::fromLatin1("A, B, C, ...")
+	     << QString::fromUtf8("\xE2\x80\xADأ, ب, ت, ...\xE2\x80\xAC")
+	     << QString::fromUtf8("\xE2\x80\xADأ, ب, ج, ...\xE2\x80\xAC")
+	     << QString::fromLatin1("*")
+	     << QString::fromLatin1("CJK");
 	return list;
 }
 

Modified: trunk/Scribus/scribus/numeration.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21682&path=/trunk/Scribus/scribus/numeration.h
==============================================================================
--- trunk/Scribus/scribus/numeration.h	(original)
+++ trunk/Scribus/scribus/numeration.h	Tue Dec 27 15:53:24 2016
@@ -61,6 +61,6 @@
 //convert passed num to string with custom chars
 QString getAsterixStringFromNum(int num, QString asterix, QChar leadingChar='_', int charsLen=0);
 //return numeration name from type
-QStringList getFormatListTr();
+QStringList getFormatList();
 
 #endif // NUMERATION_H

Modified: trunk/Scribus/scribus/ui/prefs_documentsections.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21682&path=/trunk/Scribus/scribus/ui/prefs_documentsections.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/prefs_documentsections.cpp	(original)
+++ trunk/Scribus/scribus/ui/prefs_documentsections.cpp	Tue Dec 27 15:53:24 2016
@@ -39,7 +39,7 @@
 	m_localSections=prefsData->docSectionMap;
 	m_maxPageIndex=m_doc->DocPages.count()-1;
 	m_styles.clear();
-	m_styles=getFormatListTr();
+	m_styles = getFormatList();
 	m_styles << CommonStrings::tr_None;
 //	styles << tr("1, 2, 3, ...") << tr("i, ii, iii, ...") << tr("I, II, III, ...") << tr("a, b, c, ...") << tr("A, B, C, ...") << tr("*") << tr("CJK") << CommonStrings::tr_None;
 

Modified: trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21682&path=/trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertywidget_pareffect.cpp	Tue Dec 27 15:53:24 2016
@@ -213,7 +213,7 @@
 void PropertyWidget_ParEffect::fillNumFormatCombo()
 {
 	numFormatCombo->clear();
-	numFormatCombo->addItems(getFormatListTr());
+	numFormatCombo->addItems(getFormatList());
 }
 
 void PropertyWidget_ParEffect::fillPECombo()

Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21682&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp	(original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp	Tue Dec 27 15:53:24 2016
@@ -198,7 +198,7 @@
 void SMPStyleWidget::fillNumFormatCombo()
 {
 	numFormatCombo->clear();
-	numFormatCombo->addItems(getFormatListTr());
+	numFormatCombo->addItems(getFormatList());
 }
 
 void SMPStyleWidget::fillNumerationsCombo()