Skip to content

Commit 814564f

Browse files
author
Uber
committed
opt
1 parent c65be63 commit 814564f

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

custom_components/chineseholiday/lunar.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -428,8 +428,12 @@ def solar_Term(self):
428428
def solar_date_description(self):#阳历时间
429429
#2000年01月01日
430430
return str(solar_year) + "年" + str(solar_month) + "月" + str(solar_day) + "日"
431-
def solar_week_number(self):#周数 ChineseWord.week_num_str
432-
return "第"+ChineseWord.week_num_str(datetime.datetime(int(solar_year), int(solar_month), int(solar_day)).isocalendar()[1]) + "周"
431+
432+
def solar_week_number(self):
433+
return datetime.datetime(int(solar_year), int(solar_month), int(solar_day)).isocalendar()[1]
434+
435+
def solar_week_number_description(self):#周数 ChineseWord.week_num_str
436+
return "第"+ChineseWord.week_num_str(self.solar_week_number()) + "周"
433437
#return "第"+str(datetime.datetime(int(solar_year), int(solar_month), int(solar_day)).isocalendar()[1]) + "周"
434438

435439
def week_description(self):

custom_components/chineseholiday/sensor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ def _update(self):
517517
self.attributes['lunar'] = self._lunar.lunar_date_description()
518518
self.localizedAttributes['农历'] = self._lunar.lunar_date_description()
519519
self.attributes['week_number'] = self._lunar.solar_week_number()
520-
self.localizedAttributes['周数'] = self._lunar.solar_week_number()
520+
self.localizedAttributes['周数'] = self._lunar.solar_week_number_description()
521521
term = self._lunar.solar_Term()
522522
if term:
523523
self.attributes['term'] = term

0 commit comments

Comments
 (0)