dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update RELEASE-NOTES-1.31
[lhc/web/wiklou.git]
/
languages
/
Language.php
diff --git
a/languages/Language.php
b/languages/Language.php
index
d750f7d
..
42de91e
100644
(file)
--- a/
languages/Language.php
+++ b/
languages/Language.php
@@
-1931,7
+1931,11
@@
class Language {
$gy_offset = '元';
}
$gy_offset = '昭和' . $gy_offset;
$gy_offset = '元';
}
$gy_offset = '昭和' . $gy_offset;
- } else {
+ } elseif (
+ ( ( $gy == 1989 ) && ( $gm == 1 ) && ( $gd >= 8 ) ) ||
+ ( ( $gy > 1989 ) && ( $gy < 2019 ) ) ||
+ ( ( $gy == 2019 ) && ( $gm < 5 ) )
+ ) {
# Heisei period
$gy_gannen = $gy - 1989 + 1;
$gy_offset = $gy_gannen;
# Heisei period
$gy_gannen = $gy - 1989 + 1;
$gy_offset = $gy_gannen;
@@
-1939,6
+1943,14
@@
class Language {
$gy_offset = '元';
}
$gy_offset = '平成' . $gy_offset;
$gy_offset = '元';
}
$gy_offset = '平成' . $gy_offset;
+ } else {
+ # Reiwa period
+ $gy_gannen = $gy - 2019 + 1;
+ $gy_offset = $gy_gannen;
+ if ( $gy_gannen == 1 ) {
+ $gy_offset = '元';
+ }
+ $gy_offset = '令和' . $gy_offset;
}
} else {
$gy_offset = $gy;
}
} else {
$gy_offset = $gy;