Kaydet (Commit) 251200d2 authored tarafından Caolán McNamara's avatar Caolán McNamara

don't jam numbers directly on text, leave a space

...for the "X characters at start/end of line" in the paragraph style dialog
style-description entry when hyphenation is not default

Move it into the resource string, that way translators have the chance to
position the numbers in the right place of the string.

Change-Id: I04217e27336bc032548645fc46a6daf58cccd0c4
üst 2e8ab335
...@@ -156,11 +156,9 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation ...@@ -156,11 +156,9 @@ SfxItemPresentation SfxHyphenRegionItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_COMPLETE:
{ {
rText = rText + rText = rText +
OUString::number( nMinLead ) + EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) +
EE_RESSTR( RID_SVXITEMS_HYPHEN_MINLEAD ) +
"," + "," +
OUString::number( nMinTrail ) + EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail));
EE_RESSTR( RID_SVXITEMS_HYPHEN_MINTRAIL );
return ePres; return ePres;
} }
default: default:
......
...@@ -791,14 +791,11 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation ...@@ -791,14 +791,11 @@ SfxItemPresentation SvxHyphenZoneItem::GetPresentation
rText = rText + rText = rText +
EE_RESSTR(nId) + EE_RESSTR(nId) +
cpDelimTmp + cpDelimTmp +
OUString::number( nMinLead ) + EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD).replaceAll("%1", OUString::number(nMinLead)) +
EE_RESSTR(RID_SVXITEMS_HYPHEN_MINLEAD) +
cpDelimTmp + cpDelimTmp +
OUString::number( nMinTrail ) + EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL).replaceAll("%1", OUString::number(nMinTrail)) +
EE_RESSTR(RID_SVXITEMS_HYPHEN_MINTRAIL) +
cpDelimTmp + cpDelimTmp +
OUString::number( nMaxHyphens ) + EE_RESSTR(RID_SVXITEMS_HYPHEN_MAX).replaceAll("%1", OUString::number(nMaxHyphens));
EE_RESSTR(RID_SVXITEMS_HYPHEN_MAX);
return SFX_ITEM_PRESENTATION_COMPLETE; return SFX_ITEM_PRESENTATION_COMPLETE;
} }
default: ;//prevent warning default: ;//prevent warning
......
...@@ -824,15 +824,15 @@ String RID_SVXITEMS_ORPHANS_COMPLETE ...@@ -824,15 +824,15 @@ String RID_SVXITEMS_ORPHANS_COMPLETE
}; };
String RID_SVXITEMS_HYPHEN_MINLEAD String RID_SVXITEMS_HYPHEN_MINLEAD
{ {
Text [ en-US ] = "Characters at end of line" ; Text [ en-US ] = "%1 characters at end of line" ;
}; };
String RID_SVXITEMS_HYPHEN_MINTRAIL String RID_SVXITEMS_HYPHEN_MINTRAIL
{ {
Text [ en-US ] = "Characters at beginning of line" ; Text [ en-US ] = "%1 characters at beginning of line" ;
}; };
String RID_SVXITEMS_HYPHEN_MAX String RID_SVXITEMS_HYPHEN_MAX
{ {
Text [ en-US ] = "Hyphens" ; Text [ en-US ] = "%1 hyphens" ;
}; };
String RID_SVXITEMS_PAGEMODEL_COMPLETE String RID_SVXITEMS_PAGEMODEL_COMPLETE
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment