indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Get language from calendar events

merge-requests/30/head
Bob Mottram 2022-12-17 14:08:43 +00:00
parent 3df5e6c0a8
commit 28ba04a9e0
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
daemon.py
View File

@ -18296,13 +18296,6 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.key_shortcuts.get(nickname): if self.server.key_shortcuts.get(nickname):
access_keys = self.server.key_shortcuts[nickname] access_keys = self.server.key_shortcuts[nickname]
languages_understood = \
get_understood_languages(self.server.base_dir,
self.server.http_prefix,
nickname,
self.server.domain_full,
self.server.person_cache)
# show the calendar screen # show the calendar screen
msg = html_calendar(self.server.person_cache, msg = html_calendar(self.server.person_cache,
self.server.translate, self.server.translate,
@ -18313,8 +18306,7 @@ class PubServer(BaseHTTPRequestHandler):
access_keys, access_keys,
False, self.server.system_language, False, self.server.system_language,
self.server.default_timeline, self.server.default_timeline,
self.server.theme_name, self.server.theme_name)
languages_understood)
if msg: if msg:
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)
@ -18346,13 +18338,6 @@ class PubServer(BaseHTTPRequestHandler):
if self.server.key_shortcuts.get(nickname): if self.server.key_shortcuts.get(nickname):
access_keys = self.server.key_shortcuts[nickname] access_keys = self.server.key_shortcuts[nickname]
languages_understood = \
get_understood_languages(self.server.base_dir,
self.server.http_prefix,
nickname,
self.server.domain_full,
self.server.person_cache)
# show the calendar screen # show the calendar screen
msg = html_calendar(self.server.person_cache, msg = html_calendar(self.server.person_cache,
self.server.translate, self.server.translate,
@ -18364,8 +18349,7 @@ class PubServer(BaseHTTPRequestHandler):
True, True,
self.server.system_language, self.server.system_language,
self.server.default_timeline, self.server.default_timeline,
self.server.theme_name, self.server.theme_name)
languages_understood)
if msg: if msg:
msg = msg.encode('utf-8') msg = msg.encode('utf-8')
msglen = len(msg) msglen = len(msg)

19
webapp_calendar.py
View File

@ -22,7 +22,6 @@ from utils import remove_domain_port
from utils import acct_dir from utils import acct_dir
from utils import local_actor_url from utils import local_actor_url
from utils import replace_users_with_at from utils import replace_users_with_at
from utils import get_language_from_post
from happening import get_todays_events from happening import get_todays_events
from happening import get_calendar_events from happening import get_calendar_events
from happening import get_todays_events_icalendar from happening import get_todays_events_icalendar
@ -111,8 +110,7 @@ def _html_calendar_day(person_cache: {}, translate: {},
nickname: str, domain: str, day_events: [], nickname: str, domain: str, day_events: [],
month_name: str, actor: str, month_name: str, actor: str,
theme: str, access_keys: {}, theme: str, access_keys: {},
system_language: str, system_language: str) -> str:
languages_understood: []) -> str:
"""Show a day within the calendar """Show a day within the calendar
""" """
account_dir = acct_dir(base_dir, nickname, domain) account_dir = acct_dir(base_dir, nickname, domain)
@ -174,6 +172,7 @@ def _html_calendar_day(person_cache: {}, translate: {},
start_time_str = '' start_time_str = ''
end_time_str = '' end_time_str = ''
event_description = None event_description = None
event_language = system_language
event_place = None event_place = None
post_id = None post_id = None
sender_name = '' sender_name = ''
@ -181,6 +180,10 @@ def _html_calendar_day(person_cache: {}, translate: {},
event_is_public = False event_is_public = False
# get the time place and description # get the time place and description
for evnt in event_post: for evnt in event_post:
event_language = system_language
if evnt.get('language'):
event_language = evnt['language']
if evnt['type'] == 'Event': if evnt['type'] == 'Event':
if evnt.get('post_id'): if evnt.get('post_id'):
post_id = evnt['post_id'] post_id = evnt['post_id']
@ -254,10 +257,7 @@ def _html_calendar_day(person_cache: {}, translate: {},
translate['Delete this event'] + '" src="/' + \ translate['Delete this event'] + '" src="/' + \
'icons/delete.png" /></a></td>\n' 'icons/delete.png" /></a></td>\n'
content_language = \ is_rtl = language_right_to_left(event_language)
get_language_from_post(event_post, system_language,
languages_understood)
is_rtl = language_right_to_left(content_language)
event_class = 'calendar__day__event' event_class = 'calendar__day__event'
if is_rtl: if is_rtl:
@ -335,8 +335,7 @@ def html_calendar(person_cache: {}, translate: {},
http_prefix: str, domain_full: str, http_prefix: str, domain_full: str,
text_mode_banner: str, access_keys: {}, text_mode_banner: str, access_keys: {},
icalendar: bool, system_language: str, icalendar: bool, system_language: str,
default_timeline: str, theme: str, default_timeline: str, theme: str) -> str:
languages_understood: []) -> str:
"""Show the calendar for a person """Show the calendar for a person
""" """
domain = remove_domain_port(domain_full) domain = remove_domain_port(domain_full)
@ -416,7 +415,7 @@ def html_calendar(person_cache: {}, translate: {},
nickname, domain, day_events, nickname, domain, day_events,
month_name, actor, month_name, actor,
theme, access_keys, theme, access_keys,
system_language, languages_understood) system_language)
if icalendar: if icalendar:
return get_month_events_icalendar(base_dir, nickname, domain, return get_month_events_icalendar(base_dir, nickname, domain,