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

Updated t to translation #7500

Closed
wants to merge 6 commits into from
Closed

Updated t to translation #7500

wants to merge 6 commits into from

Conversation

kamal-kaur04
Copy link
Contributor

@kamal-kaur04 kamal-kaur04 commented Feb 15, 2020

Fixes #6754 (<=== Add issue number here)

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@codecov
Copy link

codecov bot commented Feb 15, 2020

Codecov Report

❗ No coverage uploaded for pull request base (master@06c4d1c). Click here to learn what that means.
The diff coverage is 90.37%.

Impacted file tree graph

@@            Coverage Diff            @@
##             master    #7500   +/-   ##
=========================================
  Coverage          ?   81.87%           
=========================================
  Files             ?       97           
  Lines             ?     5612           
  Branches          ?        0           
=========================================
  Hits              ?     4595           
  Misses            ?     1017           
  Partials          ?        0
Impacted Files Coverage Δ
app/controllers/questions_controller.rb 90.78% <ø> (ø)
app/services/search_service.rb 95.14% <ø> (ø)
app/models/tag.rb 97.46% <ø> (ø)
app/mailers/node_mailer.rb 100% <ø> (ø)
app/models/doc_result.rb 100% <100%> (ø)
app/models/user.rb 91.05% <100%> (ø)
app/models/concerns/node_shared.rb 90.29% <100%> (ø)
app/api/srch/search.rb 69.28% <100%> (ø)
app/controllers/home_controller.rb 98.38% <100%> (ø)
app/controllers/application_controller.rb 92.3% <100%> (ø)
... and 20 more

@plotsbot
Copy link
Collaborator

2 Warnings
⚠️ It looks like you merged from master in this pull request. Please rebase to get rid of the merge commits – you may want to rewind the master branch and rebase instead of merging in from master, which can cause problems when accepting new code!
⚠️ There was an error with Danger bot’s Junit parsing: No JUnit file was found at output.xml
3 Messages
📖 @kamal-kaur04 Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 Your pull request is on the master branch. Please make a separate feature branch) with a descriptive name like new-blog-design while making PRs in the future.
📖 #
Screenshots 📸 (click to expand)

7500-test_questions.png

7500-test_embeddable_grids.png

7500-test_signup.png

7500-test_viewing_the_settings_page.png

7500-test_tag_by_author_page.png

7500-failures_test_removing_tags_from_the_post.png

7500-test_wiki_page_with_inline_grids.png

7500-test_stats.png

7500-test_viewing_the_dashboard.png

7500-test_searching_an_item_from_the_homepage.png

7500-test_signup_modal_form_validation.png

7500-test_tag_stats.png

7500-test_login_modal_form_validation.png

7500-test_questions_shadow.png

7500-test_login_modal.png

7500-test_profile_page.png

7500-test_comments.png

7500-test_tags.png

7500-test_signup_modal.png

7500-test_wiki.png

7500-test_methods.png

7500-test_tag_page.png

7500-test_blog_page_with_location_modal.png

7500-test_tag_wildcard.png

7500-test_signup_modal_disabled_submit_button_on_empty_username.png

7500-test_embeddable_thumbnail_grids.png

7500-test_front_page_with_navbar_search_autocomplete.png

7500-test_spam_moderation_page.png

7500-test_login.png

7500-test_viewing_the_dropdown_menu.png

7500-test_viewing_question_post.png

7500-test_mobile_displays.png

7500-test_simple-data-grapher_powertag.png

7500-test_front.png

7500-test_question_page.png

7500-test_tag_contributors_page.png

7500-test_blog.png

7500-test_people.png

7500-test_wiki_revisions.png

Learn about automated screenshots

Generated by 🚫 Danger

@sssash18
Copy link
Contributor

@kamal-kaur04 Please mention the issue number it solves.Thanks

@cesswairimu
Copy link
Collaborator

Hi could you please add the issue link to the issue this pull request fixes on your pull request on this line "Fixes issue_link" this will help other contributors while reviewing your changes. It also helps in automatically closing the issue when the pull request is merged. Thanks

@kamal-kaur04
Copy link
Contributor Author

@cesswairimu @sssash18 I have edited the issue number in the pull request. Hope this is right way to do it.
Thanks.

@cesswairimu
Copy link
Collaborator

Thanks...Restarting travis

@cesswairimu
Copy link
Collaborator

Hi @kamal-kaur04 I think you need to rebase this branch for travis to pass...Let me know if you need any help with that. Thanks

@kamal-kaur04
Copy link
Contributor Author

Hi @cesswairimu,
Sure I will try to do this. If I will be encountered with some issue I will ask.
Thank you.

@kamal-kaur04
Copy link
Contributor Author

kamal-kaur04 commented Mar 9, 2020

Hello @cesswairimu, I thought to restart my forked repo to the original repo by using upstream as the original repo and do the required changes again. But it gave me error permission denied. I am not able to rebase this pull request. What should be done? Shall I remove the forked repo and then address this issue?

@cesswairimu
Copy link
Collaborator

Oh your PR is on master branch 🤔 ...well I think you should always make changes while on a branch.
Do this, checkout to a new branch say git checkout -b update_t_translation
Then checkout to master. Then do
git pull upstream master assuming your upstream is publiclab/plots2
Then checkout to your branch git checkout update_t_translation and do git rebase -i master
Then push git push origin update_t_translation then create a new pull request aginst the new branch and close this PR...does it make sense? PIng me if you run into any more issues I can help. Thanks

@kamal-kaur04
Copy link
Contributor Author

kamal-kaur04 commented Mar 10, 2020

@cesswairimu
I am getting error remote: Permission to publiclab/plots2.git denied to kamal-kaur04. fatal: unable to access 'https://github.com/publiclab/plots2.git/': The requested URL returned error: 403
after executing git push origin update_t_translation

@cesswairimu
Copy link
Collaborator

When rebasing a text editor will open, mostly its nano if you ar doing it through the terminal...just save and exit(save Ctrl + O to exit nano, type Ctrl + X )

@kamal-kaur04
Copy link
Contributor Author

Hii @cesswairimu I have noticed that this issue is already been solved in the main repository.

@cesswairimu
Copy link
Collaborator

oh cool,

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.

change function t to translation in app/views/notes/_coauthored_notes.html.erb
5 participants