For Gnome 3.16, diff against v11. Fix Time display reported by madoldman. (Actually a bug in lunar-date, see https://github.com/yetist/lunar-date/pull/1) diff --git a/lunarcal@ailin.nemui/extension.js b/lunarcal@ailin.nemui/extension.js index cd40446..2ceac82 100644 --- a/lunarcal@ailin.nemui/extension.js +++ b/lunarcal@ailin.nemui/extension.js @@ -11,6 +11,10 @@ const LunarDate = imports.gi.LunarDate; const ExtensionUtils = imports.misc.extensionUtils; const Me = ExtensionUtils.getCurrentExtension(); const Convenience = Me.imports.convenience; +const Gettext_lunarDate = imports.gettext.domain('lunar-date'); +const _ld = Gettext_lunarDate.gettext; +const diZhi = "Zǐ, Chǒu, Yín, Mǎo, Chén, Sì, Wǔ, Wèi, Shēn, Yǒu, Xū, Hài" + .split(", ").map(function(_){ return _ld(_); }); let replacementFunc = [], ld = new LunarDate.Date, settingsChanged = [], localSettings = {}; let settings; @@ -23,6 +27,10 @@ ld.setDateNoon = function (date) { this.set_solar_date(date.getFullYear(), (1+date.getMonth()), date.getDate(), 12); }; +ld.getShi = function () { + return diZhi[~~((+this.strftime("%(hour)")+1)/2)%12]; +}; + function init() { } @@ -34,7 +42,7 @@ function _make_new_with_args (my_class, args) { function _getLunarClockDisplay() { let show_date = settings.get_boolean('show-date'); return ((show_date ? "\u2001" + ld.strftime("%(YUE)月%(RI)日") : "") + - (settings.get_boolean('show-time') ? ld.strftime(show_date ? "%(SHI)时" : "%(SHI)") : "")); + (settings.get_boolean('show-time') ? ld.getShi() + (show_date ? "时" : "") : "")); }; // avoid replacing WallClock with a custom Object inheriting from

Great!