-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
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
Point users to commercial solution for their private repositories #5849
Conversation
|
||
{% blocktrans %} | ||
Here only public repositories are listed, If you want to find your private | ||
repositories, you can find on <a href="https://travis-ci.com/">trvais-ci.com</a> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The URL should point to readthedocs.com the commercial service of ReadtheDocs. Also we need to make sure the message does not appear on the commercial website.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ohk sir , I will change the url from travis-ci.com to readthedocs.com and second thing , Can you please tell me that where can I access commercial website? in source code so that I can fix this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The source code from the commercial site is private, you can add an named block like https://github.com/rtfd/readthedocs.org/blob/c0bcb243b14b465695cacf9aab644da23c411ca7/readthedocs/templates/projects/project_import.html#L216 so we can override that value in the other template
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ohk thanks @stsewd
@@ -70,7 +70,10 @@ | |||
</span> | |||
|
|||
<h1>{% trans "Import a Repository" %}</h1> | |||
|
|||
{% block non-commercial %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The translation block shouldn't be removed. And the block name could be something like import-tip
or something like that
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can I use? {% blocktrans import-public-repo %}
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, those can be nested, take a look at https://github.com/rtfd/readthedocs.org/blob/c0bcb243b14b465695cacf9aab644da23c411ca7/readthedocs/templates/projects/project_import.html#L198-L207
Hello @saadmk11 , Do I have to make more changes? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for your contribution. 💯
Looks good. what do you think? @stsewd
<p> | ||
{% blocktrans trimmed %} | ||
Here only public repositories are listed, If you want to find your private | ||
repositories, you can find on <a href="https://readthedocs.com/">readthedocs.com</a>. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
repositories, you can find on <a href="https://readthedocs.com/">readthedocs.com</a>. | |
repositories, you can find them on <a href="https://readthedocs.com/">readthedocs.com</a>. |
@@ -70,7 +70,16 @@ | |||
</span> | |||
|
|||
<h1>{% trans "Import a Repository" %}</h1> | |||
|
|||
{% block import-repo %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you should put your code inside
{% if has_connected_accounts %}
.....
{% endif %}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ohk
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What message should I put in else condition ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just wrap your code with the condition.
{% if has_connected_accounts %}
<your code>
{% endif %}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @stsewd , Do I have to make more changes?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good. I think we can improve the block name before merging.
Also, I'd like @davidfischer to take a look at the copy of the message since he will probably have some suggestions on how to communicate this better.
@@ -70,7 +70,18 @@ | |||
</span> | |||
|
|||
<h1>{% trans "Import a Repository" %}</h1> | |||
|
|||
{% if has_connected_accounts %} | |||
{% block import-repo %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The block name could be a little more descriptive, like "private-repo-tip" or similar.
How about something like:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copy looks great!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good Work Thanks 💯
Thank you @saadmk11 |
@humitos , Do I need to make some changes ? |
No! This is great! Thanks for your collaboration! |
your welcome :) |
Fix #5770