From a8ce7216e130703be9c34ffea334f3abaf18cf0d Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 7 May 2019 10:29:15 -0500 Subject: [PATCH 1/6] Test --- .gitlab-ci.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c64a86f..a6c83d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,27 @@ test_py3: - '%PYTHON3% -m coverage report --omit="test*"' coverage: '/TOTAL.+ ([0-9]{1,3}%)/' +documentation: + type: deploy + tags: + - windows10 + before_script: + - '%PYTHON3% -v' + script: + - copy changelog.md doc\changelog.md + - cd doc + - '%PYTHON2% documentation_importer.py' + - cd ..\src + - '%PYTHON2% ..\doc\generator.py' + - 'move documentation/* ..\\documentation' + only: + - master + artifacts: + paths: + - documentation + name: socializer_documentation + expire_in: 1 day + alpha_python3: type: deploy tags: From 95671966cd030b84d87cb3d00da4c12dc85f2ba2 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 7 May 2019 10:32:12 -0500 Subject: [PATCH 2/6] Test 2 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6c83d6..db133a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ documentation: - '%PYTHON2% documentation_importer.py' - cd ..\src - '%PYTHON2% ..\doc\generator.py' - - 'move documentation/* ..\\documentation' + - 'move documentation/* ..\\' only: - master artifacts: From a9e5963b74f9da6aacbb9b49ec8b7ac07c02fab7 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 7 May 2019 10:35:12 -0500 Subject: [PATCH 3/6] Test 3 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db133a3..6d74cf5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ documentation: - '%PYTHON2% documentation_importer.py' - cd ..\src - '%PYTHON2% ..\doc\generator.py' - - 'move documentation/* ..\\' + - 'move documentation\* ..\' only: - master artifacts: From 6df1b80941caf717c605e7ebfe58ffce3a9c4e31 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 7 May 2019 10:37:31 -0500 Subject: [PATCH 4/6] Test 4 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d74cf5..add1b9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ documentation: - '%PYTHON2% documentation_importer.py' - cd ..\src - '%PYTHON2% ..\doc\generator.py' - - 'move documentation\* ..\' + - 'move documentation ..\' only: - master artifacts: From e73d92754e5e3cd58c350ab50ce98f007091bb44 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Tue, 7 May 2019 11:38:04 -0500 Subject: [PATCH 5/6] Fixed a typo in documentation translation --- .../LC_MESSAGES/socializer-documentation.mo | Bin 143566 -> 143270 bytes .../LC_MESSAGES/socializer-documentation.po | 11 ++++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/locales/ru/LC_MESSAGES/socializer-documentation.mo b/src/locales/ru/LC_MESSAGES/socializer-documentation.mo index 2e183206d5a4f4a8c67a91f97795de16d77f216e..01f1912d05e9d3ca6866bef6753e2ff0e651aa4f 100644 GIT binary patch delta 1922 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 diff --git a/src/locales/ru/LC_MESSAGES/socializer-documentation.po b/src/locales/ru/LC_MESSAGES/socializer-documentation.po index 92c0476..4efd589 100644 --- a/src/locales/ru/LC_MESSAGES/socializer-documentation.po +++ b/src/locales/ru/LC_MESSAGES/socializer-documentation.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: Socializer 0.20\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-23 15:44-0500\n" -"PO-Revision-Date: 2019-05-06 11:45-0500\n" +"PO-Revision-Date: 2019-05-07 11:37-0500\n" "Last-Translator: Manuel Cortez \n" "Language-Team: Daria Ratnikova\n" "Language: ru\n" @@ -1835,10 +1835,7 @@ msgid "* Destroy: dismisses the list you're on, if possible." msgstr "* Уничтожить: удаляет список, в котором Вы находитесь, если это возможно." msgid "### Player menu" -msgstr "" -"### * Удалить: открывает меню, в котором Вы можете удалить уже существующий альбом, " -"принадлежащий вам. В настоящее время поддерживаются только аудио и видео альбомы." -"Меню аудиоплеера" +msgstr "### Меню аудиоплеера" msgid "" "* Play: Plays the currently focused audio item, if the current buffer contains " @@ -2145,8 +2142,8 @@ msgid "" "Socializer is developed and maintained by [Manuel Cortez,](https://manuelcortez." "net) with contributions by [Anibal Hernandez](https://dragodark.com)" msgstr "" -"Socializer разработан и поддерживается [Мануэлем Кортесом] (https://manuelcortez." -"net) при участии [Анибала Эрнандеса] (https://dragodark.com)" +"Socializer разработан и поддерживается [Мануэлем Кортесом](https://manuelcortez." +"net) при участии [Анибала Эрнандеса](https://dragodark.com)" msgid "" "We would also like to thank the translators of Socializer, who have allowed the " From 40052dbf3fa9498db2e98f0e902d866f94135d18 Mon Sep 17 00:00:00 2001 From: Manuel Cortez Date: Wed, 15 May 2019 17:19:02 -0500 Subject: [PATCH 6/6] Fixed audio player on walls --- src/presenters/displayPosts/audio.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/presenters/displayPosts/audio.py b/src/presenters/displayPosts/audio.py index 9fda65e..3d2caac 100644 --- a/src/presenters/displayPosts/audio.py +++ b/src/presenters/displayPosts/audio.py @@ -82,8 +82,8 @@ class displayAudioPresenter(base.basePresenter): def play(self, audio_index): post = self.post[audio_index] - if player.player.stream != None: - return player.player.pause() + if player.player.check_is_playing() == True: + return pub.sendMessage("stop") pub.sendMessage("play", object=post) def load_audios(self):