View Issue Details

IDProjectCategoryView StatusLast Update
0012819ScribusTranslationpublic2015-02-19 09:00
ReporterFirasH Assigned Tojghali  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Product Version1.5.0svn 
Fixed in Version1.4.5.svn 
Summary0012819: [PATCH] Fix some non translated UI strings
DescriptionFix some non translated UI strings. The attached patch is tested.
Additional Information1.5.0.svn (19630)
TagsNo tags attached.
PatchYes

Relationships

related to 0012742 closedcbradney Save/Discard/Cancel should be translatable on document closing (QMessageBox translation) 

Activities

jghali

2014-11-19 22:43

administrator   ~0034225

Last edited: 2014-11-19 22:45

The addition of Q_OBJECT macro in proper place seems to fix non working translation. Please check it does the same on your side. I've already patched canvasmode_eyedropper.h and canvasmode_framelinks.h.

FirasH

2014-11-20 13:43

developer   ~0034226

Last edited: 2014-11-20 13:54

It works! Thanks jghali!
Now ScribusView is not needed.

FirasH

2014-11-20 13:43

developer  

12819-Patch.diff (3,657 bytes)   
Index: scribus/canvasmode_framelinks.cpp
===================================================================
--- scribus/canvasmode_framelinks.cpp	(revisione 19635)
+++ scribus/canvasmode_framelinks.cpp	(copia locale)
@@ -189,7 +189,7 @@
					if (bb->prevInChain() != NULL)
					{
						ScMessageBox msgBox(QMessageBox::Question, tr("Linking Text Frames"),
-										   "<qt>" + ScribusView::tr("You are trying to insert a frame into an existing text chain, where would you like to insert it?") + "<qt>");
+										   "<qt>" + tr("You are trying to insert a frame into an existing text chain, where would you like to insert it?") + "</qt>");
						QPushButton *cancelButton = msgBox.addButton(CommonStrings::tr_Cancel, QMessageBox::RejectRole);
						QPushButton *beforeButton = msgBox.addButton(tr("Before"), QMessageBox::AcceptRole);
						QPushButton *afterButton = msgBox.addButton(tr("After"), QMessageBox::AcceptRole);
@@ -248,15 +248,15 @@
				{
					//CB Mouse is released when this messagebox takes focus
					m_canvas->m_viewMode.m_MouseButtonPressed = false;
-					ScMessageBox::warning(m_view, ScribusView::tr("Linking Text Frames"),
-											 "<qt>" + ScribusView::tr("You are trying to link a frame to itself.") + "</qt>");
+					ScMessageBox::warning(m_view, tr("Linking Text Frames"),
+										 "<qt>" + tr("You are trying to link a frame to itself.") + "</qt>");
				}
				else
				{
					//CB Mouse is released when this messagebox takes focus
					m_canvas->m_viewMode.m_MouseButtonPressed = false;
-					ScMessageBox::warning(m_view, ScribusView::tr("Linking Text Frames"),
-										 "<qt>" + ScribusView::tr("You are trying to link a non-empty frame to frame which is already linked.") + "</qt>");
+					ScMessageBox::warning(m_view, tr("Linking Text Frames"),
+										 "<qt>" + tr("You are trying to link a non-empty frame to frame which is already linked.") + "</qt>");
				}
			}
			else
Index: scribus/canvasmode_eyedropper.cpp
===================================================================
--- scribus/canvasmode_eyedropper.cpp	(revisione 19635)
+++ scribus/canvasmode_eyedropper.cpp	(copia locale)
@@ -166,7 +166,7 @@
	{
		bool ok;
		bool nameFound=false;
-		QString questionString="<qt>"+ tr("The selected color does not exist in the document's color set. Please enter a name for this new color.")+"</qt>";
+		QString questionString="<qt>" + tr("The selected color does not exist in the document's color set. Please enter a name for this new color.") + "</qt>";
		do
		{
			colorName = QInputDialog::getText(m_ScMW, tr("Color Not Found"), questionString, QLineEdit::Normal, QString::null, &ok);
@@ -173,7 +173,7 @@
			if (ok)
			{
				if (m_doc->PageColors.contains(colorName))
-					questionString="<qt>"+ tr("The name you have selected already exists. Please enter a different name for this new color.")+"</qt>";
+					questionString="<qt>" + tr("The name you have selected already exists. Please enter a different name for this new color.") + "</qt>";
				else
					nameFound=true;
			}
Index: scribus/canvasmode_edit.cpp
===================================================================
--- scribus/canvasmode_edit.cpp	(revisione 19635)
+++ scribus/canvasmode_edit.cpp	(copia locale)
@@ -66,11 +66,11 @@
	Dxp = Dyp = -1;
	oldCp = Cp = -1;
	frameResizeHandle = -1;
-	m_blinker = new QTimer(view);
+	m_blinker = new QTimer(view);
	connect(m_blinker, SIGNAL(timeout()), this, SLOT(blinkTextCursor()));
	connect(view->horizRuler, SIGNAL(MarkerMoved(double, double)), this, SLOT(rulerPreview(double, double)));
	mRulerGuide = -1;
-	m_longCursorTime=false;
+	m_longCursorTime = false;
	m_keyRepeat = false;
 }

12819-Patch.diff (3,657 bytes)   

FirasH

2014-11-20 20:36

developer   ~0034229

Is it possible to backport the fix to 1.4.5.svn?

jghali

2014-11-23 12:54

administrator   ~0034232

Done! A ts file bump will be needed tho. Should come soon enough.

FirasH

2014-11-23 18:03

developer   ~0034235

Thanks jghali!

Issue History

Date Modified Username Field Change
2014-11-18 12:27 FirasH New Issue
2014-11-18 12:28 FirasH File Added: 12819-Patch.diff
2014-11-18 12:29 FirasH Relationship added related to 0012742
2014-11-18 12:32 FirasH Assigned To => FirasH
2014-11-18 12:32 FirasH Status new => assigned
2014-11-19 16:47 FirasH File Added: 12819-Patch2.diff
2014-11-19 17:01 FirasH File Deleted: 12819-Patch.diff
2014-11-19 17:01 FirasH File Deleted: 12819-Patch2.diff
2014-11-19 17:02 FirasH File Added: 12819-Patch.diff
2014-11-19 21:52 FirasH Assigned To FirasH =>
2014-11-19 21:52 FirasH Status assigned => new
2014-11-19 22:43 jghali Note Added: 0034225
2014-11-19 22:44 jghali Note Edited: 0034225
2014-11-19 22:45 jghali Note Edited: 0034225
2014-11-20 12:43 Kunda Summary Fix some non translated UI strings => [PATCH] Fix some non translated UI strings
2014-11-20 13:35 FirasH File Deleted: 12819-Patch.diff
2014-11-20 13:43 FirasH Note Added: 0034226
2014-11-20 13:43 FirasH File Added: 12819-Patch.diff
2014-11-20 13:54 FirasH Note Edited: 0034226
2014-11-20 19:47 jghali Status new => resolved
2014-11-20 19:47 jghali Fixed in Version => 1.5.0svn
2014-11-20 19:47 jghali Resolution open => fixed
2014-11-20 19:47 jghali Assigned To => jghali
2014-11-20 20:36 FirasH Note Added: 0034229
2014-11-23 12:54 jghali Note Added: 0034232
2014-11-23 12:54 jghali Fixed in Version 1.5.0svn => 1.4.5.svn
2014-11-23 18:03 FirasH Note Added: 0034235
2014-11-23 18:03 FirasH Status resolved => closed
2015-02-01 11:01 cbradney Status closed => resolved
2015-02-19 09:00 christoph_s Status resolved => closed