diff options
| author | László Németh <laszlo.nemeth@collabora.com> | 2016-09-09 15:52:23 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2016-09-10 05:57:11 +0000 |
| commit | 681d5fd37e469491268d40147c621187dc6f4b95 (patch) | |
| tree | 1a0c48eca9cbb32479caedd0c908d6e57f1a7f07 /extras/source/autocorr/emoji | |
| parent | 7ed3e749f7b525bdbbbd353f85c765becb90daa6 (diff) | |
tdf#97191 fix emoji correction conflict with time format
by removing the bad patterns from DocumentList.xmls, and
adding "h" to the end of the bad en-US emoji short names,
(separated by a space according to the orthography):
:1 h: instead of :1:, :10 h: instead of :10: etc.
Also complete the fix for tdf#93233, removing the :1:30:-like
(never working) patterns.
Change-Id: Ia39e1f0d5fdbf686713c6deacf2a56e0beb8b42b
Reviewed-on: https://gerrit.libreoffice.org/28756
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'extras/source/autocorr/emoji')
| -rw-r--r-- | extras/source/autocorr/emoji/emoji.ulf | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/extras/source/autocorr/emoji/emoji.ulf b/extras/source/autocorr/emoji/emoji.ulf index 268ae34be2a4..f06b2e0a9fb1 100644 --- a/extras/source/autocorr/emoji/emoji.ulf +++ b/extras/source/autocorr/emoji/emoji.ulf @@ -3501,51 +3501,51 @@ en-US = "button" [CLOCK_FACE_ONE_OCLOCK] x-comment = "🕐 (U+1F550), see http://wiki.documentfoundation.org/Emoji" -en-US = "1" +en-US = "1 h" [CLOCK_FACE_TWO_OCLOCK] x-comment = "🕑 (U+1F551), see http://wiki.documentfoundation.org/Emoji" -en-US = "2" +en-US = "2 h" [CLOCK_FACE_THREE_OCLOCK] x-comment = "🕒 (U+1F552), see http://wiki.documentfoundation.org/Emoji" -en-US = "3" +en-US = "3 h" [CLOCK_FACE_FOUR_OCLOCK] x-comment = "🕓 (U+1F553), see http://wiki.documentfoundation.org/Emoji" -en-US = "4" +en-US = "4 h" [CLOCK_FACE_FIVE_OCLOCK] x-comment = "🕔 (U+1F554), see http://wiki.documentfoundation.org/Emoji" -en-US = "5" +en-US = "5 h" [CLOCK_FACE_SIX_OCLOCK] x-comment = "🕕 (U+1F555), see http://wiki.documentfoundation.org/Emoji" -en-US = "6" +en-US = "6 h" [CLOCK_FACE_SEVEN_OCLOCK] x-comment = "🕖 (U+1F556), see http://wiki.documentfoundation.org/Emoji" -en-US = "7" +en-US = "7 h" [CLOCK_FACE_EIGHT_OCLOCK] x-comment = "🕗 (U+1F557), see http://wiki.documentfoundation.org/Emoji" -en-US = "8" +en-US = "8 h" [CLOCK_FACE_NINE_OCLOCK] x-comment = "🕘 (U+1F558), see http://wiki.documentfoundation.org/Emoji" -en-US = "9" +en-US = "9 h" [CLOCK_FACE_TEN_OCLOCK] x-comment = "🕙 (U+1F559), see http://wiki.documentfoundation.org/Emoji" -en-US = "10" +en-US = "10 h" [CLOCK_FACE_ELEVEN_OCLOCK] x-comment = "🕚 (U+1F55A), see http://wiki.documentfoundation.org/Emoji" -en-US = "11" +en-US = "11 h" [CLOCK_FACE_TWELVE_OCLOCK] x-comment = "🕛 (U+1F55B), see http://wiki.documentfoundation.org/Emoji" -en-US = "12" +en-US = "12 h" [CLOCK_FACE_ONE-THIRTY] x-comment = "🕜 (U+1F55C), see http://wiki.documentfoundation.org/Emoji" |