| Age | Commit message (Collapse) | Author | Files | Lines |
|---|
|
This patch brings order out of chaos,
organizing the outline choices into
academic, modern, simple numeric, and misc columns.
The very first suggestion should be the academic standard.
Next comes a distinctly different modern alternative
Simple numeric moves over to be above the other numeric,
followed by a demo of the kind of mixture that can be designed in LO.
Since the academic standard uses Roman numerals,
it is offset on the next row by the other one containing Roman numerals
followed by a modern classic,
and the all-numeric ISO standard retains it current position.
The bullet oddball logically remains as the last suggestion.
In this patch there was no change made to the actual suggestions
themselves. Earlier patches made changes to 3 definitions,
which allowed for the nice correlations.
I missed changing the descriptive "strings" in the earlier patches.
I had assumed earlier that these monotonous descriptions
were dynamically produced...
Since the English description should not be translated,
I added a comment that will be extracted to the PO as a comment.
(Thanks Andras).
I think it would be nice to use strings
"Academic MLA/CMOS/Turabian/OWL compliant outline"
"ISO 2145 outine"
but that could be made in a separate patch.
Let me just point out what happened with the strings
in case this helps with translation
NOTE: only languages that ultimately inherit from en_US need to re-translate:
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_0
-no string change
-moved to _3
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_1
-string changed / list modified earlier
-moved to _5
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_2
-string changed / list modified earlier
-moved to _1
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_3
-no string change
-moved to _2
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_4
-string changed / list modified earlier
-moved to _0
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_5
-no string change
-moved to _4
RID_SVXSTR_OUTLINENUM_DESCRIPTION_6
-no change
RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
-no change
Suggested translation order:
-cut _3 and paste into _2
-cut _0 and paste into _3
-cut _4 and paste into _0 and fix definition
-cut _5 and paste into _4
-cut _1 and paste into _5 and re-define
-re-define _1
Change-Id: Ie4ec8423acddc24efefb270d9ed19ab77566e6e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150805
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
|
|
This reverts the change of A.I.a.i. -> A.I.a.i.1.
made by commit dd8ed1fdbc63499ac958d28536c3c5540455358b.
While it wasn't necessarily a bad change, it no longer has
any justification, since the complementary change in the
other outline definition was modified to become MLA compliant.
Rather than make any change at all, just revert back to the
original definition, and leave the level definition to the
normal 4 levels of numbering before the bullets start.
Change-Id: I88d792a6dd20bd519755349905975cf9028f9fa6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145236
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
|
|
Change 1. a) -> 1) a) 1) A)
This is intended as a clean, modern style of outline
that has good visual spacing in LibreOffice.
This differentiates it a bit more from the first option,
and extends the numbered level to the typical depth of 4,
while still keeping a logical suffix pattern
and maintaining the general "theme" of the previous definition.
Yes, it is a bit odd to have a capital A following
a smaller case a. However, this is at the fourth
level, which isn't reached very often,
and I wanted to keep a choice that focuses on a small a.
Surprisingly, with the default 12pt/Liberation font, a
10) still fits in the allotted space before the tabstop,
so in most cases this outline will have proper visual spacing
all the way up to 99).
There are plenty of choices that start with 1 followed by a dot,
so I used this opportunity to create the only list
that starts with a ")" suffix. Google docs for example has a
1) a) i) choice, but for modern lists I don't think
we want to use roman numerals.
Change-Id: I34725d6aa113831eaeaa88c295b3b3f1294f8998
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145155
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
|
|
Change-Id: I2cccc7c2c3621434a4dbbcdd032672c668632494
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145158
Tested-by: Jenkins
Reviewed-by: Vernon, Stuart Foote <vsfoote@libreoffice.org>
Reviewed-by: Justin Luth <jluth@mail.com>
|
|
Change 1.(a).i.A. -> A.1.a.1.
This is intended as a clean, modern style of outline
that has good visual spacing in LibreOffice.
It provides a simple alternative to the second style,
reversing the order while still keeping a logical suffix pattern.
This design will easily allow large/long lists
to fit in the allotted space before the tabstop.
There was no attempt to match the theme of the
previous definition, since it neither looked
good in LO's default spacing, nor was it consistent/logical.
Change-Id: If7de1302110a3c97922bd2eeba7a917444110b27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145156
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
Reviewed-by: Vernon, Stuart Foote <vsfoote@libreoffice.org>
|
|
Changed I.A.i.a) -> I.A.1.a.i.
The overwhelming result of a google search for
"official/correct outline list format"
indicates that the third level should be a 1, not an i.
MLA Handbook (according to wikipedia) uses the order
I.A.1.a.i. (a) (1) i)
Chicago Mode of Style is usually interpreted as
I.A.1.a) or I.A.1.a. with varying lower sublevels/suffixes.
Wikipedia also suggest the logical order of
I.A.1.a.i.I) A) 1) a) i) (I) (A) (1) (a) (i)
Change-Id: I7fcc8a1ee727d6cddca4bf0c6a8461538769cf5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145147
Tested-by: Justin Luth <jluth@mail.com>
Reviewed-by: Justin Luth <jluth@mail.com>
|
|
Deciding whether the numbering should be Left, Right, or Center
is a rather important setting. Specifically for Roman numerals
(which grow very wide as they increment to 7 and 8)
the numbering styles set these to right aligned.
This really helps for keeping the text nicely aligned.
The numbering styles are built-in LO defaults,
but locale files can define numbering and outline
choices. This patch add the setting for "adjust" on
the outline levels.
For en_US, it makes sense to right-align roman numeral levels.
[The only other highly likely candidate for this that I could find
was old Hungarian (SZEKELY_ROVAS), but it doesn't seem
to be used in any locale definitions.]
I only changed en_US for now, but of course many other
locales are also using NumType="3" and NumType="4".
This only applies to the toolbar/sidebar SVX code path.
The Bullets and Numbering dialog does not currently
modify any spacing, so I didn't apply the adjustment either.
It also doesn't make sense to do this on single numbering changes
(aka ContinuousNumberingLevels or LC_NumberingLevel)
because we don't know or control the first line indent there either.
But at least for toolbar Outlines, we do change every level,
and so can set a (somewhat) appropriate spacing.
[Setting SvxAdjust without adjusting the spacing
is pointless. Don't make any changes at all if
the spacing ends up causing problems.]
The Numbering IVX/ivx styles set the firstLineIndent to -174,
so I did the same here. This is the scariest part of this change.
AFAICS SvxAdjust::Left is a non-locale aDefNumStyle default,
so hardcoding that for undefined LC_OutlineNumberingLevel
shouldn't be too scary.
Change-Id: I52deefe88aa55c55c9531b651411f64accb86f7f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144978
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
|
|
There are 10 levels in numbering,
so it only makes sense to allow
outline definitions for all 10 levels.
Note that DOC/X formats only allow 9 levels,
There are two code paths that read these definitions.
The SVX toolbar code to allow 10 levels (SVX_MAX_NUM)
was already completed in the previous patch.
This commit allows 10 levels for the
Bullets and Numbering menu dialog.
Since all choices MUST define the same number of levels,
I only added one more. I hope that there isn't some secret
kind of requirement that ALL LOCALE's must also use
the same number of definitions - it doesn't seem to.
[Although not a direct comparison, bg_BG defines 10
single number levels, compared to en_US's 8,
and some Chinese locales also do more than 8.]
Change-Id: Ibe00d54cfa4577db83eba368b92be11055b076ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144976
Tested-by: Jenkins
Reviewed-by: Justin Luth <jluth@mail.com>
|
|
Add NumberText NatNum12 number formats, e.g. "One Hundred",
and currency formats, e.g. "One U.S. Dollar and Twenty Cents"
to number formatting dialog windows, i.e. Format Cells->Numbers
in Calc and Format Numbers in Writer (Edit Fields->Format->
Additional formats...).
Fix also bad English title case:
"One Euro *and* *Twenty-Two* cents" (not *And* and *Twenty-two*)
Details:
– svl: list NatNum12 NumberText currency codes in Currency
formats (i.e. after choosing Currency category).
– svx: Recognize bank symbol "CURRENCY" in NatNum12 parameters
defined in locale resource files. For example,
"[NatNum12 CURRENCY]" is converted to "[NatNum12 USD]" in
the number format dialog windows, using bank symbol of
the current locale settings.
Recognize compatible (old) bank symbol "CCC" in NatNum12
parameters defined in locale resource files. For example,
"[NatNum12 CCC]" is converted to "[NatNum12 DEM]" in
the number format dialog windows, using bank symbol of
the compatible currency of the German locale settings.
User-defined formats with arbitrary bank codes are
recognized as currency formats, e.g. modifying
"[NatNum12 USD]" to "[NatNum12 EUR]" in the dialog window
results a new currency format item.
– i18npool/*en_US.xml: define four Standard NatNum12 formats
(lower case, sentence case, title case, upper case) and
four Currency NatNum12 formats (title case, title case with
digits, upper case, upper case with digits).
– cui: use lower sample numbers for spell out formats:
– 100 for Standard:
One Hundred
one hundred
One hundred
ONE HUNDRED
– 1.2 for Currency:
One U.S. Dollar
ONE U.S. DOLLAR
One U.S. Dollar and Twenty Cents
ONE U.S. DOLLAR AND TWENTY CENTS
– i18npool: fix English title casing of NatNum12 conversions:
– Don't apply casing on "and", according to the title
case rules, for example:
"One Euro and One Cent" instead of
"One Euro And One Cent".
– Apply casing on the second element of the hyphenated
compound words:
"Twenty-One" instead of the bad "Twenty-one".
– add unit test for extended Number and Currency categories.
Note: according to the changes, update user-defined number format id in
chart2/qa/extras/chart2dump/reference/chartdatatest/simple_chart.txt
Change-Id: Ieaf9a8f75a4f197b858eaf67f83484df70295834
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141994
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
|
|
Change-Id: I3a2f2206d9784de2da6af8ea2b882e1ebe6205e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118439
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
Otherwise CppunitTest_sw_odfimport testDateFormFormats fails with
- Expected: Wednesday, March 4, 2020
- Actual : Wednesday, March 04, 2020
if DateFormatter uses number formatter.
This is also what
https://www.localeplanet.com/icu/en-US/index.html
lists for Date.0 and formatindex="30" has as well.
This makes adapting CppunitTest_svl_qa_cppunit testNumberFormat
necessary.
Change-Id: I1c8cfd954f34f742b0397b8f922d22eb11ae19f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118361
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
|
|
Add a predefined NF_DATETIME_SYS_DDMMYYYY_HHMM format code with
formatindex="50" to all locale data files, which shifts all
reserved area internally generated built-in formats up by one.
Reserved area was filled already so that boundary has to be
increased as well. Add some flexibility for future additions by
setting the new boundary to 65, free first format index to be used
by additional locale data formats is 66 now. Adapt all locales to
the new boundary.
The existing predefined NF_DATETIME_SYSTEM_SHORT_HHMM format code
with formatindex="46" mostly was and is used with 2-digit years
(stemming back from the old binary format and Excel
compatibility), some locales that don't use 2-digit years at all
already defined it to 4-digit years. Keep those but move the
default="true" attribute (if so) to the new "50" format.
Modify populating the format list such that resulting duplicates
will be suppressed there as well.
Also try to match the new format in ODF import if a long year was
requested with date+time.
Finally set the new format as default for all *_IT locales. In
future changing the default date+time format to 4-digit year is
just a matter of moving the default="true" attribute to the new
format.
Change-Id: Ib16aa9fda0e71b2d03f78e3dd013785de03cd288
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89265
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
|
|
Corrects en_US for index
At present en_GB index is defined as en_US,
and all other (en_*) are defined as en_US or en_GB
Change-Id: Ib4c3e189c1d9a08c8f4eb17a1da526fbf23291d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86080
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze@documentfoundation.org>
|
|
In preparation of adding some builtin format codes, actually already
NF_FRACTION_3 and NF_FRACTION_4 needed that.
Change-Id: I734a1ef5e6405aceaace7d44e8901a6183dc2a64
|
|
For all l10n, add format for engineering format ##0.00E+00
decimal separator adapted
msgid: ScientificFormatskey3 or ScientificFormatskey4 if previous one was
already used
formatindex: 78 (free in most l10n, and near 77 which used as
scientific format for many l10n)
exceptions: ko_KR formatindex=91; th_TH formatindex=88; zh_TW
formatindex=80 (next free value)
Change-Id: I703c1503bdac85386e9994fdd67b00aa6006d992
Reviewed-on: https://gerrit.libreoffice.org/15527
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
|
|
Modify all locale data to set ScientificFormatskey2 (0.00E+00)
as default for scientific format instead of ScientificFormatskey1 (0.00E+000)
Change-Id: Ib8f3d22af82c078468ea70ebae0b078ac55a0003
Reviewed-on: https://gerrit.libreoffice.org/14593
Tested-by: Eike Rathke <erack@redhat.com>
Reviewed-by: Eike Rathke <erack@redhat.com>
|
|
Change-Id: Ib70b737af3628c77a72b6b8e9267ad31890597c8
|
|
cws mba34issues01: #i117709#: make sure that parent of error message box is visible
Patch contributed by Mathias Bauer
http://svn.apache.org/viewvc?view=revision&revision=1172346
i#119036 - improve user experience of certification dialog - only shown once
Patch contributed by Oliver-Rainer Wittmann
http://svn.apache.org/viewvc?view=revision&revision=1299727
|
|
|
|
|
|
LocaleNode.cxx says it's only legal for those based on en_US
|
|
This reverts commit 97ce42ad29560d39560b7f7c23785142803ae52f.
Adding the format to every lang. breaks the std. format indexing
(thus, unit test too)
Moreover, it is not "legal" for non-English locale (or so
LocaleNode.cxx says)
|
|
+ teaching Calc num. formatting dialog to work with it
+ adding it to ~most locale (certainly I've forgotten some)
|
|
|
|
2007/04/27 17:04:30 er 1.17.86.1: #i74008# add Jewish calendar and number format codes
|
|
2006/03/03 12:13:08 er 1.16.14.1: #i61657# new ::com::sun::star::i18n::Currency2.LegacyOnly
|
|
2005/11/16 16:33:57 er 1.15.38.1: CurrencyID is USD, unused and not significant, but as this file is often used as a template..
|
|
2005/07/01 14:51:52 er 1.14.4.1: #i50684# correct era order
|
|
2005/04/19 15:13:51 er 1.13.4.1: #i47148# aligned to CLDR
|
|
2005/03/10 17:24:21 er 1.12.26.1: #i44734# implement DTD version check and CLDR flag
|
|
2004/06/11 18:36:25 er 1.11.4.1: #i28518# AM/PM instead of am/pm
|
|
2004/04/09 20:06:32 khong 1.10.86.1: #i25323# put index page information into localedata for each langauges
|
|
2003/03/19 14:02:11 er 1.8.2.1.20.1: #i12256# Correct LongDateDayOfWeekSeparator and NN and NNNN format codes.
Changed date formats' DefaultName comment from "DIN 5008 (EN 28601)" to
"ISO 8601 (DIN 5008, EN 28601)" for de_DE,
"ISO 8601 (EN 28601)" for European locales,
and "ISO 8601" for all others.
Removed other DefaultName rubbish.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
