From 5e3db15a8e17424a32446dd46e1752b52b893af0 Mon Sep 17 00:00:00 2001 From: Mostafa Qanbaryan Date: Thu, 18 Jul 2024 13:01:49 +0330 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20shamsi=20calendar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/pcal | 21 ++++++++++++--------- waybar/config | 1 - 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/pcal b/scripts/pcal index 140c859..05497fa 100755 --- a/scripts/pcal +++ b/scripts/pcal @@ -2,10 +2,10 @@ # https://github.com/a5hk/pcal BREAKS=(-61 9 38 199 426 686 756 818 1111 1181 1210 1635 2060 2097 2192 2262 2324 2394 2456 3178) -DAY_NAMES_FA=(Sh Ye Do Se Ch Pa Jo) +DAY_NAMES_FA=(شن یک دو سه چه پن جم) declare -A DAY_NAMES=([Sh]=0 [Ye]=1 [Do]=2 [Se]=3 [Ch]=4 [Pa]=5 [Jo]=6) declare -A DAY_NAMES_EN=([Sat]=Sh [Sun]=Ye [Mon]=Do [Tue]=Se [Wed]=Ch [Thu]=Pa [Fri]=Jo) -MONTH_NAMES=(Farvardin Ordibehesht Khordad Tir Mordad Shahrivar Mehr Aban Azar Dey Bahman Esfand) +MONTH_NAMES=(فروردین اردیبهشت خرداد تیر مرداد شهریور مهر آبان آذر دی بهمن اسفند) exit_error() { >&2 echo "$1" @@ -222,12 +222,12 @@ print_current_month() { local etag='' local current_day=$(current_persian_day) local current_month_name=${MONTH_NAMES[$((current_month - 1))]} - local month_name_length=${#current_month_name} - local month_pad=$(((25 + month_name_length) / 2)) - printf " %s %${month_pad}s" $(current_persian_year) $current_month_name + printf " $(current_persian_year)" printf ' \\n ' - printf '%s ' ${DAY_NAMES_FA[@]} + printf "$current_month_name" + printf ' \\n ' + printf '%s ' ${DAY_NAMES_FA[@]} printf ' \\n ' for ((i = 0; i < 6; i++)); do @@ -235,10 +235,13 @@ print_current_month() { if [[ $counter -lt $index || $day -gt $month_length ]]; then printf " " else + stag='' + etag='' + if [[ $day -eq $current_day ]]; then - stag='' - etag='' - else + stag="" + etag='' + elif [[ $day -gt $current_day ]]; then stag='' etag='' fi diff --git a/waybar/config b/waybar/config index 95ef648..f6babb0 100644 --- a/waybar/config +++ b/waybar/config @@ -174,7 +174,6 @@ }, "custom/shamsi": { "format": "{}", - "escape": true, "tooltip": true, "return-type": "json", "min-length": 14,