openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Fix translations loading on linux system-wide installation

This commit is contained in:
Chocimier 2023-04-05 06:34:40 +00:00 committed by Tomas Groth
parent 6f935b9a95
commit b34d984e16
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/common/applocation.py
View File

@ -157,7 +157,7 @@ def _get_os_dir_path(dir_type):
if 'share/openlp' not in site_dir:
continue
directory = Path(site_dir)
if directory.exists():
if (directory / 'i18n').exists():
return directory
return Path(site_dirs[0])
if dir_type == AppLocation.DataDir:

11
tests/openlp_core/common/test_applocation.py
View File

@ -227,8 +227,8 @@ def test_get_directory_for_language_dir_from_macosx(mocked_getenv, mocked_is_mac
@patch('openlp.core.common.applocation.is_win')
@patch('openlp.core.common.applocation.is_macosx')
@patch('openlp.core.common.applocation.AppDirs')
@patch('openlp.core.common.applocation.Path')
def test_get_directory_for_language_dir_from_linux(MockPath, MockAppDirs, mocked_is_macosx, mocked_is_win,
@patch('openlp.core.common.applocation.Path.exists', autospec=True)
def test_get_directory_for_language_dir_from_linux(mocked_exists, MockAppDirs, mocked_is_macosx, mocked_is_win,
mocked_resolve):
"""
Test the AppLocation.get_directory() method for AppLocation.LanguageDir
@ -238,11 +238,10 @@ def test_get_directory_for_language_dir_from_linux(MockPath, MockAppDirs, mocked
mocked_resolve.return_value = openlp_i18n_path
mocked_is_win.return_value = False
mocked_is_macosx.return_value = False
mocked_dirs = MagicMock(site_data_dir=os.pathsep.join(['/usr/share/gnome/openlp', '/usr/local/share/openlp',
'/usr/share/openlp']))
candidate_dirs = ['/usr/share/gnome/openlp', '/usr/local/share/openlp', '/usr/share/openlp']
mocked_dirs = MagicMock(site_data_dir=os.pathsep.join(candidate_dirs))
MockAppDirs.return_value = mocked_dirs
mocked_path = MagicMock(**{'exists.return_value': True, '__truediv__.return_value': openlp_i18n_path})
MockPath.side_effect = [MagicMock(**{'exists.return_value': False}), mocked_path]
mocked_exists.side_effect = lambda p: p in candidate_dirs + [openlp_i18n_path]
# WHEN: We call AppLocation.get_directory
directory = AppLocation.get_directory(AppLocation.LanguageDir)