View Issue Details

IDProjectCategoryView StatusLast Update
0013374ScribusUser Interfacepublic2015-09-27 17:08
ReporterFirasH Assigned ToFirasH  
PrioritynormalSeverityminorReproducibilityalways
Status closedResolutionfixed 
Product Version1.5.1svn 
Fixed in Version1.5.1svn 
Summary0013374: Fix non updated strings in Properties > Text after language change
DescriptionFix non updated strings in Properties > Text after language change.
Additional Information1.5.1.svn (20428)
TagsNo tags attached.
PatchYes

Relationships

related to 0013375 closedFirasH Fix non updated strings in Properties > Image after language change 

Activities

FirasH

2015-09-27 12:44

developer  

13374-Patch.diff (2,947 bytes)   

diff --git a/scribus/ui/propertiespalette_text.cpp b/scribus/ui/propertiespalette_text.cpp
--- a/scribus/ui/propertiespalette_text.cpp
+++ b/scribus/ui/propertiespalette_text.cpp
@@ -629,13 +629,14 @@
 {
 	paraStyleLabel->setText( tr("Paragraph St&yle:"));
 	charStyleLabel->setText( tr("Character St&yle:"));
-	
+
 	colorWidgetsItem->setText(0, tr("Color && Effects"));
-	advancedWidgetsItem->setText(0, tr("Advanced Settings"));
 	flopItem->setText(0, tr("First Line Offset"));
+	orphanItem->setText(0, tr("Orphans and Widows"));
+	parEffectItem->setText(0, tr("Paragraph Effects"));
 	distanceItem->setText(0, tr("Columns && Text Distances"));
 	optMarginsItem->setText(0, tr("Optical Margins"));
-	orphanItem->setText(0, tr("Orphans and Widows"));
+	advancedWidgetsItem->setText(0, tr("Advanced Settings"));
 	pathTextItem->setText(0, tr("Path Text Properties"));
 
 	int oldLineSpacingMode = lineSpacingModeCombo->currentIndex();
@@ -649,12 +650,12 @@
 	fontSize->setSuffix(ptSuffix);
 	lineSpacing->setSuffix(ptSuffix);
 
-	advancedWidgets->languageChange();
 	colorWidgets->languageChange();
+	flopBox->languageChange();
+	orphanBox->languageChange();
 	distanceWidgets->languageChange();
-	flopBox->languageChange();
 	optMargins->languageChange();
-	orphanBox->languageChange();
+	advancedWidgets->languageChange();
 	pathTextWidgets->languageChange();
 
 	textAlignment->languageChange();
diff --git a/scribus/ui/propertywidget_distance.cpp b/scribus/ui/propertywidget_distance.cpp
--- a/scribus/ui/propertywidget_distance.cpp
+++ b/scribus/ui/propertywidget_distance.cpp
@@ -434,6 +434,7 @@
 {
 	columnsLabel->setText( tr("Colu&mns:"));
 
+	verticalAlignLabel->setText( tr("Vertical Alignment"));
 	int oldAliLabel = verticalAlign->currentIndex();
 	verticalAlign->clear();
 	verticalAlign->addItem( tr("Top"));
diff --git a/scribus/ui/propertywidget_distancebase.ui b/scribus/ui/propertywidget_distancebase.ui
--- a/scribus/ui/propertywidget_distancebase.ui
+++ b/scribus/ui/propertywidget_distancebase.ui
@@ -36,7 +36,7 @@
     <number>2</number>
    </property>
    <item row="0" column="0">
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="verticalAlignLabel">
      <property name="text">
       <string>Vertical Alignment</string>
      </property>
diff --git a/scribus/ui/propertywidget_pareffect.cpp b/scribus/ui/propertywidget_pareffect.cpp
--- a/scribus/ui/propertywidget_pareffect.cpp
+++ b/scribus/ui/propertywidget_pareffect.cpp
@@ -570,8 +570,9 @@
 	numStartLabel->setText(tr("Start"));
 	numPrefixLabel->setText(tr("Prefix"));
 	numSuffixLabel->setText(tr("Suffix"));
+	peGroup->setTitle(tr("Effect Parameters"));
+	peIndent->setText(tr("Auto-Indent"));
 	peOffsetLabel->setText(tr("Offset"));
-	peIndent->setText(tr("Auto-Indent"));
 	peCharStyleLabel->setText(tr("Char Style"));
 	peCharStyleCombo->setToolTip(tr("Choose chracter style or leave blank for use default paragraph style"));
 }
13374-Patch.diff (2,947 bytes)   

FirasH

2015-09-27 12:49

developer   ~0036416

Found a typo... Uploading a second revision of the patch.

FirasH

2015-09-27 12:51

developer  

13374-PatchREV2.diff (3,107 bytes)   

diff --git a/scribus/ui/propertywidget_pareffect.cpp b/scribus/ui/propertywidget_pareffect.cpp
--- a/scribus/ui/propertywidget_pareffect.cpp
+++ b/scribus/ui/propertywidget_pareffect.cpp
@@ -570,10 +570,11 @@
 	numStartLabel->setText(tr("Start"));
 	numPrefixLabel->setText(tr("Prefix"));
 	numSuffixLabel->setText(tr("Suffix"));
+	peGroup->setTitle(tr("Effect Parameters"));
+	peIndent->setText(tr("Auto-Indent"));
 	peOffsetLabel->setText(tr("Offset"));
-	peIndent->setText(tr("Auto-Indent"));
 	peCharStyleLabel->setText(tr("Char Style"));
-	peCharStyleCombo->setToolTip(tr("Choose chracter style or leave blank for use default paragraph style"));
+	peCharStyleCombo->setToolTip(tr("Choose character style or leave blank for use default paragraph style"));
 }
 
 void PropertyWidget_ParEffect::openEnhanced()
diff --git a/scribus/ui/propertywidget_distancebase.ui b/scribus/ui/propertywidget_distancebase.ui
--- a/scribus/ui/propertywidget_distancebase.ui
+++ b/scribus/ui/propertywidget_distancebase.ui
@@ -36,7 +36,7 @@
     <number>2</number>
    </property>
    <item row="0" column="0">
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="verticalAlignLabel">
      <property name="text">
       <string>Vertical Alignment</string>
      </property>
diff --git a/scribus/ui/propertywidget_distance.cpp b/scribus/ui/propertywidget_distance.cpp
--- a/scribus/ui/propertywidget_distance.cpp
+++ b/scribus/ui/propertywidget_distance.cpp
@@ -434,6 +434,7 @@
 {
 	columnsLabel->setText( tr("Colu&mns:"));
 
+	verticalAlignLabel->setText( tr("Vertical Alignment"));
 	int oldAliLabel = verticalAlign->currentIndex();
 	verticalAlign->clear();
 	verticalAlign->addItem( tr("Top"));
diff --git a/scribus/ui/propertiespalette_text.cpp b/scribus/ui/propertiespalette_text.cpp
--- a/scribus/ui/propertiespalette_text.cpp
+++ b/scribus/ui/propertiespalette_text.cpp
@@ -629,13 +629,14 @@
 {
 	paraStyleLabel->setText( tr("Paragraph St&yle:"));
 	charStyleLabel->setText( tr("Character St&yle:"));
-	
+
 	colorWidgetsItem->setText(0, tr("Color && Effects"));
-	advancedWidgetsItem->setText(0, tr("Advanced Settings"));
 	flopItem->setText(0, tr("First Line Offset"));
+	orphanItem->setText(0, tr("Orphans and Widows"));
+	parEffectItem->setText(0, tr("Paragraph Effects"));
 	distanceItem->setText(0, tr("Columns && Text Distances"));
 	optMarginsItem->setText(0, tr("Optical Margins"));
-	orphanItem->setText(0, tr("Orphans and Widows"));
+	advancedWidgetsItem->setText(0, tr("Advanced Settings"));
 	pathTextItem->setText(0, tr("Path Text Properties"));
 
 	int oldLineSpacingMode = lineSpacingModeCombo->currentIndex();
@@ -649,12 +650,12 @@
 	fontSize->setSuffix(ptSuffix);
 	lineSpacing->setSuffix(ptSuffix);
 
-	advancedWidgets->languageChange();
 	colorWidgets->languageChange();
+	flopBox->languageChange();
+	orphanBox->languageChange();
 	distanceWidgets->languageChange();
-	flopBox->languageChange();
 	optMargins->languageChange();
-	orphanBox->languageChange();
+	advancedWidgets->languageChange();
 	pathTextWidgets->languageChange();
 
 	textAlignment->languageChange();
13374-PatchREV2.diff (3,107 bytes)   

jghali

2015-09-27 16:45

administrator   ~0036419

Applied, thanks!

FirasH

2015-09-27 17:08

developer   ~0036421

Thanks jghali!
Fixed in 1.5.1.svn (20430).

Issue History

Date Modified Username Field Change
2015-09-27 12:43 FirasH New Issue
2015-09-27 12:44 FirasH File Added: 13374-Patch.diff
2015-09-27 12:49 FirasH Note Added: 0036416
2015-09-27 12:51 FirasH File Added: 13374-PatchREV2.diff
2015-09-27 13:50 FirasH Issue cloned: 0013375
2015-09-27 13:50 FirasH Relationship added related to 0013375
2015-09-27 16:45 jghali Note Added: 0036419
2015-09-27 16:45 jghali Status new => resolved
2015-09-27 16:45 jghali Fixed in Version => 1.5.1svn
2015-09-27 16:45 jghali Resolution open => fixed
2015-09-27 16:45 jghali Assigned To => FirasH
2015-09-27 17:08 FirasH Note Added: 0036421
2015-09-27 17:08 FirasH Status resolved => closed