Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

https support #400

Merged
merged 1 commit into from
Mar 3, 2020
Merged

https support #400

merged 1 commit into from
Mar 3, 2020

Conversation

rubdos
Copy link
Contributor

@rubdos rubdos commented Jan 30, 2019

Will eventually resolve #369.

@rubdos
Copy link
Contributor Author

rubdos commented Feb 1, 2019

I haven 't tested this yet, will do that later... Just wanted this out somewhere already :)

src/tvheadend/Settings.h Outdated Show resolved Hide resolved
@rubdos rubdos force-pushed the https branch 2 times, most recently from 72a34b8 to ea7ebef Compare February 3, 2019 17:33
src/tvheadend/Settings.h Outdated Show resolved Hide resolved
@rubdos rubdos force-pushed the https branch 2 times, most recently from 9e15bc7 to bca324a Compare February 3, 2019 22:24
@rubdos
Copy link
Contributor Author

rubdos commented Feb 3, 2019

Also fixed the clang build error.

@rubdos
Copy link
Contributor Author

rubdos commented Feb 4, 2019

Mind that I still didn't have a chance to test this, so please do so before merging :'-)

@Jalle19
Copy link
Contributor

Jalle19 commented Feb 4, 2019

I don't have HTTPS set up so I can't really test

@rubdos
Copy link
Contributor Author

rubdos commented Feb 27, 2019

I tested it working, but the text for the button in the settings is still empty.

@rubdos
Copy link
Contributor Author

rubdos commented Mar 4, 2019

I tested it working, but the text for the button in the settings is still empty.

Could someone give me a hint how I can update the necessary translation files for this?

@Gee1111
Copy link

Gee1111 commented Mar 27, 2019

this also works for the windows addon ?

@rubdos
Copy link
Contributor Author

rubdos commented Apr 1, 2019

this also works for the windows addon ?

I wouldn't know how that'd be different. But hey, it's Windows, better test it :-)

@Jalle19
Copy link
Contributor

Jalle19 commented Apr 2, 2019

Could someone give me a hint how I can update the necessary translation files for this?

You only need to update en_GB, the rest are handled later on through Transifex. If you're using another language in Kodi you might wanna switch to the en_GB while developing so you can see your changes.

Copy link
Member

@ksooo ksooo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please change settings id to first available general settings id (30011) and supply a string for it.

pvr.hts/resources/settings.xml Outdated Show resolved Hide resolved
@Rechi Rechi changed the base branch from master to Leia April 15, 2019 20:55
@ksooo ksooo changed the base branch from Leia to Matrix April 26, 2019 08:24
@ksooo
Copy link
Member

ksooo commented Apr 26, 2019

@rubdos have you seen that we requested changes?

@rubdos
Copy link
Contributor Author

rubdos commented May 11, 2019

Excuse me for the late reply. Have been quite busy.

W.r.t. base branch: are you sure we don't want to backport this into Leia? It's quite an annoying bug imo.

@jobrien2001
Copy link

@ksooo Any chance to review this? :D

@rubdos rubdos force-pushed the https branch 3 times, most recently from 1c70f16 to 3c37a92 Compare November 16, 2019 18:58
@rubdos
Copy link
Contributor Author

rubdos commented Nov 16, 2019

Apparently I never fixed the translation ID. That's done now. I also rebased against Matrix.

@trimethia
Copy link

@ksooo Any chance to review this?

@AlwinEsch
Copy link
Contributor

Related to xbmc/xbmc#17307, not forget a rebase of request to allow further Jenkins use!

git remote add upstream https://github.com/kodi-pvr/pvr.hts
git fetch upstream
git rebase upstream/Matrix

@rubdos
Copy link
Contributor Author

rubdos commented Mar 1, 2020

It's only the third time I'm rebasing this now, I would really appreciate to know what still has to be done to get this merged.

@ksooo
Copy link
Member

ksooo commented Mar 1, 2020

Please update the changelog and increase addon minor version and we are ready to go.

@ksooo
Copy link
Member

ksooo commented Mar 1, 2020

Please update the changelog and increase addon minor version and we are ready to go.

Well not really. Kodi default language is en_gb, not en_us. So, please add the new settings string to pvr.hts/resources/language/resource.language.en_gb/strings.po and remove it from pvr.hts/resources/language/resource.language.en_us/strings.po as translations are handled via Transifex, not Github.

Copy link
Member

@ksooo ksooo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my comments

@rubdos
Copy link
Contributor Author

rubdos commented Mar 2, 2020

See my comments

I don't see any comments in the diff linked by "View changes".

I've changed the translation to en_gb, added the changelog entry, incremented the minor version. Would you like me to squash everything together?

@ksooo
Copy link
Member

ksooo commented Mar 2, 2020

Yes, please squash to a single commit.

pvr.hts/addon.xml.in Outdated Show resolved Hide resolved
src/tvheadend/HTSPConnection.cpp Outdated Show resolved Hide resolved
@rubdos
Copy link
Contributor Author

rubdos commented Mar 2, 2020

Comments addressed, squashed!

Copy link
Member

@ksooo ksooo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contribution.

@ksooo ksooo changed the title WIP: https support https support Mar 3, 2020
@ksooo ksooo merged commit f70e66f into kodi-pvr:Matrix Mar 3, 2020
@rubdos rubdos deleted the https branch April 8, 2022 14:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

New feature: HTTPS option in settings
7 participants