scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-01 04:32:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixes repeat tutorial button and localization typos

Browse source
This commit is contained in:
zmagod 2016-10-13 12:59:02 +02:00
parent 931cba2666
commit 1614cbc2b2
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/users/settings_controller.rb
View file

@ -447,6 +447,7 @@ class Users::SettingsController < ApplicationController
def reset_tutorial def reset_tutorial
if @user.update(tutorial_status: 0) && params[:org][:id] if @user.update(tutorial_status: 0) && params[:org][:id]
@user.update(current_organization_id: params[:org][:id])
cookies.delete :tutorial_data cookies.delete :tutorial_data
cookies.delete :current_tutorial_step cookies.delete :current_tutorial_step
cookies[:repeat_tutorial_org_id] = { cookies[:repeat_tutorial_org_id] = {

3
app/views/projects/index.html.erb
View file

@ -111,9 +111,6 @@
</div> </div>
<% end %> <% end %>
<%= render partial: 'projects/index/introductory_popup' %>
<%= javascript_include_tag 'projects/introdutory_popup' %>
<% if current_organization.projects.length> 0 %> <% if current_organization.projects.length> 0 %>
<%= render partial: "projects/index/org_projects", <%= render partial: "projects/index/org_projects",
locals: { org: current_organization, locals: { org: current_organization,

4
config/locales/en.yml
View file

@ -1119,8 +1119,8 @@ en:
team_name_help: "Team name is required in order to create your own team." team_name_help: "Team name is required in order to create your own team."
settings: settings:
changed_org_flash: "You are working on %{team} now!" changed_org_flash: "You are working on %{team} now!"
changed_org_error_flash: "Something get wrong! Try again later." changed_org_error_flash: "Something went wrong! Try again later."
changed_org_in_search: "The searched item is not in your current team. You will be redirected on %{team} team!" changed_org_in_search: "The searched item is not in your current team. You will be redirected to %{team} team!"
navigation: navigation:
preferences: "My preferences" preferences: "My preferences"
organizations: "My teams" organizations: "My teams"