Merge branch '3.1'

This commit is contained in:
Ghostkeeper 2017-12-01 15:13:11 +01:00
commit e5966de99d
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A

View File

@ -162,6 +162,7 @@ UM.PreferencesPage
//Russian is disabled for being incomplete: append({ text: "Русский", code: "ru_RU" }) //Russian is disabled for being incomplete: append({ text: "Русский", code: "ru_RU" })
append({ text: "Türkçe", code: "tr_TR" }) append({ text: "Türkçe", code: "tr_TR" })
append({ text: "简体中文", code: "zh_CN" }) append({ text: "简体中文", code: "zh_CN" })
append({ text: "正體字", code: "zh_TW" })
var date_object = new Date(); var date_object = new Date();
if (date_object.getUTCMonth() == 8 && date_object.getUTCDate() == 19) //Only add Pirate on the 19th of September. if (date_object.getUTCMonth() == 8 && date_object.getUTCDate() == 19) //Only add Pirate on the 19th of September.