summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2016-06-01 13:34:34 +0200
committerEike Rathke <erack@redhat.com>2016-06-01 11:45:50 +0000
commit2bc5ebd2fd08a5b7f456efa5054db7caefef2156 (patch)
treee4608add39873aeca6686252e5716b0a082fed0b
parent09063ddab885bd432d09d0d2205511edbf6fe2f9 (diff)
eliminate use of locale dependent date strings where possible
... unless used in input or formatting example. Change-Id: Ibda8fdf6db62b61ec4bb0e2e6bfd096f37849916 (cherry picked from commit d2dbd0dacb5c653680ed94d6a2ebabd52e300a0a) Reviewed-on: https://gerrit.libreoffice.org/25773 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
-rw-r--r--source/text/scalc/01/04060102.xhp2
-rw-r--r--source/text/scalc/01/func_date.xhp2
-rw-r--r--source/text/scalc/01/func_weeknumadd.xhp2
3 files changed, 3 insertions, 3 deletions
diff --git a/source/text/scalc/01/04060102.xhp b/source/text/scalc/01/04060102.xhp
index 3e7a4fc81c..09f3bf76a6 100644
--- a/source/text/scalc/01/04060102.xhp
+++ b/source/text/scalc/01/04060102.xhp
@@ -82,7 +82,7 @@
<paragraph role="warning" id="par_id1953489" xml-lang="en-US" l10n="NEW">When you copy and paste cells containing date values between different spreadsheets, both spreadsheet documents must be set to the same date base. If date bases differ, the displayed date values will change!</paragraph>
<paragraph role="heading" id="hd_id757469" xml-lang="en-US" level="2" l10n="NEW">Two digits years</paragraph>
<paragraph role="paragraph" id="par_id3149720" xml-lang="en-US" l10n="U" oldref="183">In <switchinline select="sys"><caseinline select="MAC"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - General</emph> you find the area <emph>Year (two digits)</emph>. This sets the period for which two-digit information applies. Note that changes made here have an effect on some of the following functions.</paragraph>
-<paragraph role="note" id="par_id3150654" xml-lang="en-US" l10n="U" oldref="185">When entering dates, slashes or dashes used as date separators may be interpreted as arithmetic operators. Therefore, dates entered in this format are not always recognized as dates and result in erroneous calculations. To keep dates from being interpreted as parts of formulas, place them in quotation marks, for example, "07/20/54".</paragraph>
+<paragraph role="note" id="par_id3150654" xml-lang="en-US" l10n="U" oldref="185">When entering dates as part of formulas, slashes or dashes used as date separators are interpreted as arithmetic operators. Therefore, dates entered in this format are not recognized as dates and result in erroneous calculations. To keep dates from being interpreted as parts of formulas use the DATE function, for example, DATE(1954;7;20), or place the date in quotation marks and use the ISO 8601 notation, for example, "1954-07-20". Avoid using locale dependent date formats such as "07/20/54", the calculation may produce errors if the document is loaded under different locale settings.</paragraph>
<paragraph role="heading" id="par_idN1067A" xml-lang="en-US" level="2" l10n="NEW">Functions</paragraph>
<sort order="asc">
<section id="workday">
diff --git a/source/text/scalc/01/func_date.xhp b/source/text/scalc/01/func_date.xhp
index d56396f75d..aa318ebd34 100644
--- a/source/text/scalc/01/func_date.xhp
+++ b/source/text/scalc/01/func_date.xhp
@@ -43,7 +43,7 @@
<emph>Month</emph> is an integer indicating the month.</paragraph>
<paragraph role="paragraph" id="par_id3153183" xml-lang="en-US" l10n="CHG" oldref="9">
<emph>Day</emph> is an integer indicating the day of the month.</paragraph>
-<paragraph role="paragraph" id="par_id3156260" xml-lang="en-US" l10n="CHG" oldref="10">If the values for month and day are out of bounds, they are carried over to the next digit. If you enter <item type="input">=DATE(00;12;31)</item> the result will be 12/31/00. If, on the other hand, you enter <item type="input">=DATE(00;13;31)</item> the result will be 1/31/01.</paragraph>
+<paragraph role="paragraph" id="par_id3156260" xml-lang="en-US" l10n="CHG" oldref="10">If the values for month and day are out of bounds, they are carried over to the next digit. If you enter <item type="input">=DATE(00;12;31)</item> the result will be 2000-12-31. If, on the other hand, you enter <item type="input">=DATE(00;13;31)</item> the result will be 2001-01-31.</paragraph>
<paragraph role="heading" id="hd_id3147477" xml-lang="en-US" level="3" l10n="U" oldref="12">Example</paragraph>
<paragraph role="paragraph" id="par_id3152589" xml-lang="en-US" l10n="CHG" oldref="16">
<item type="input">=DATE(00;1;31)</item> yields 1/31/00 if the cell format setting is MM/DD/YY.</paragraph>
diff --git a/source/text/scalc/01/func_weeknumadd.xhp b/source/text/scalc/01/func_weeknumadd.xhp
index de257e6a06..4f0a9a11b5 100644
--- a/source/text/scalc/01/func_weeknumadd.xhp
+++ b/source/text/scalc/01/func_weeknumadd.xhp
@@ -42,7 +42,7 @@
<paragraph role="paragraph" id="par_id3154098" xml-lang="en-US" l10n="U" oldref="227">
<emph>ReturnType</emph> is 1 for week beginning on a Sunday, 2 for week beginning on a Monday.</paragraph>
<paragraph role="heading" id="hd_id3152886" xml-lang="en-US" level="3" l10n="U" oldref="228">Example</paragraph>
-<paragraph role="paragraph" id="par_id3149973" xml-lang="en-US" l10n="U" oldref="229">In which week number does 12/24/2001 fall?</paragraph>
+<paragraph role="paragraph" id="par_id3149973" xml-lang="en-US" l10n="U" oldref="229">In which week number does 2001-12-24 fall?</paragraph>
<paragraph role="paragraph" id="par_id3149914" xml-lang="en-US" l10n="U" oldref="230">
<item type="input">=WEEKNUM_EXCEL2003(DATE(2001;12;24);1)</item> returns 52.</paragraph>
</body>