diff --git a/Gemfile b/Gemfile index 6e61d36c64..456fa6a561 100644 --- a/Gemfile +++ b/Gemfile @@ -8,6 +8,7 @@ gem "rubytree", "~> 0.5.2", :require => 'tree' gem "rdoc", ">= 2.4.2" # Needed only on RUBY_VERSION = 1.8, ruby 1.9+ compatible interpreters should bring their csv gem "fastercsv", "~> 1.5.0", :platforms => [:ruby_18, :jruby, :mingw_18] +gem 'delayed_job', "~>2.0.4" group :test do gem 'shoulda', '~> 2.10.3' diff --git a/Rakefile b/Rakefile index e1b7068de5..5ec9435523 100644 --- a/Rakefile +++ b/Rakefile @@ -15,3 +15,9 @@ rescue LoadError end require 'tasks/rails' + +begin + require 'delayed/tasks' +rescue LoadError + STDERR.puts "Run `rake gems:install` to install delayed_job" +end diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index b6fb1da807..e14afc44d3 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -34,16 +34,13 @@ class MyController < ApplicationController verify :xhr => true, :only => [:add_block, :remove_block, :order_blocks] - def index - page - render :action => 'page' - end - # Show user's page - def page + def index @user = User.current @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT + render :action => 'page', :layout => 'base' end + alias :page :index # Edit user's account def account diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a3c2b37eb6..7d7a54ba75 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -15,8 +15,18 @@ class UsersController < ApplicationController layout 'admin' - before_filter :require_admin, :except => :show - before_filter :find_user, :only => [:show, :edit, :update, :edit_membership, :destroy_membership] + before_filter :require_admin, :except => [:show, :deletion_info, :destroy] + before_filter :find_user, :only => [:show, + :edit, + :update, + :edit_membership, + :destroy_membership, + :destroy, + :deletion_info] + before_filter :require_login, :only => [:deletion_info] # should also contain destroy but post data can not be redirected + before_filter :authorize_for_user, :only => [:destroy] + before_filter :check_if_deletion_allowed, :only => [:deletion_info, + :destroy] accept_key_auth :index, :show, :create, :update include SortHelper @@ -200,6 +210,24 @@ class UsersController < ApplicationController end end + def destroy + # as destroying users is a lengthy process we handle it in the background + # and lock the account now so that no action can be performed with it + @user.status = User::STATUS_LOCKED + @user.save + + @user.delay.destroy + + flash[:notice] = l('account.deleted') + + if @user == User.current + logged_user = nil + redirect_to signin_path + else + redirect_to users_path + end + end + def destroy_membership @membership = Member.find(params[:membership_id]) if request.post? && @membership.deletable? @@ -211,10 +239,14 @@ class UsersController < ApplicationController end end + def deletion_info + render :action => 'deletion_info', :layout => my_or_admin_layout + end + private def find_user - if params[:id] == 'current' + if params[:id] == 'current' || params['id'].nil? require_login || return @user = User.current else @@ -223,4 +255,32 @@ class UsersController < ApplicationController rescue ActiveRecord::RecordNotFound render_404 end + + def authorize_for_user + if (User.current != @user || + User.current == User.anonymous) && + !User.current.admin? + + render_403 + false + end + end + + def check_if_deletion_allowed + if (User.current.admin && @user != User.current && !Setting.users_deletable_by_admins?) || + (User.current == @user && !Setting.users_deletable_by_self?) + render_404 + false + end + end + + def my_or_admin_layout + # TODO: how can this be done better: + # check if the route used to call the action is in the 'my' namespace + if url_for(:delete_my_account_info) == request.url + 'my' + else + 'admin' + end + end end diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb index e9324e57a8..4fb7cbd5e7 100644 --- a/app/helpers/my_helper.rb +++ b/app/helpers/my_helper.rb @@ -13,4 +13,7 @@ #++ module MyHelper + def deletion_info_path + url_for(:delete_my_account_info) + end end diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index ec0c2ba96f..ef56f013c7 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -17,6 +17,7 @@ module SettingsHelper tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general}, {:name => 'display', :partial => 'settings/display', :label => :label_display}, {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication}, + {:name => 'users', :partial => 'settings/users', :label => :label_user_plural }, {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural}, {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking}, {:name => 'notifications', :partial => 'settings/notifications', :label => :field_mail_notification}, diff --git a/app/models/user.rb b/app/models/user.rb index c397dde381..6e0a72a06b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,7 +18,7 @@ class User < Principal include Redmine::SafeAttributes # Account statuses - STATUS_ANONYMOUS = 0 + STATUS_BUILTIN = 0 STATUS_ACTIVE = 1 STATUS_REGISTERED = 2 STATUS_LOCKED = 3 @@ -40,9 +40,17 @@ class User < Principal ['none', :label_user_mail_option_none] ] + USER_DELETION_JOURNAL_BUCKET_SIZE = 1000; + has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)}, :after_remove => Proc.new {|user, group| group.user_removed(user)} - has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify + has_many :issue_categories, :foreign_key => 'assigned_to_id', + :dependent => :nullify + has_many :assigned_issues, :foreign_key => 'assigned_to_id', + :class_name => 'Issue', + :dependent => :nullify + has_many :watches, :class_name => 'Watcher', + :dependent => :delete_all has_many :changesets, :dependent => :nullify has_one :preference, :dependent => :destroy, :class_name => 'UserPreference' has_one :rss_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='feeds'" @@ -60,7 +68,12 @@ class User < Principal # Prevents unauthorized assignments attr_protected :login, :admin, :password, :password_confirmation, :hashed_password - validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) } + validates_presence_of :login, + :firstname, + :lastname, + :mail, + :if => Proc.new { |user| !(user.is_a?(AnonymousUser) || user.is_a?(DeletedUser)) } + validates_uniqueness_of :login, :if => Proc.new { |user| !user.login.blank? }, :case_sensitive => false validates_uniqueness_of :mail, :if => Proc.new { |user| !user.mail.blank? }, :case_sensitive => false # Login must contain lettres, numbers, underscores only @@ -72,6 +85,9 @@ class User < Principal validates_confirmation_of :password, :allow_nil => true validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true + before_destroy :delete_associated_public_queries + before_destroy :reassign_associated + named_scope :in_group, lambda {|group| group_id = group.is_a?(Group) ? group.id : group.to_i { :conditions => ["#{User.table_name}.id IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id] } @@ -617,6 +633,46 @@ class User < Principal def candidates_for_project_allowance project @registered_allowance_evaluators.map{ |f| f.project_granting_candidates(project) }.flatten.uniq end + + def reassign_associated + substitute = DeletedUser.first + + [Issue, Attachment, WikiContent, News, Comment, Message].each do |klass| + klass.update_all ['author_id = ?', substitute.id], ['author_id = ?', id] + end + + [TimeEntry, Journal, Query].each do |klass| + klass.update_all ['user_id = ?', substitute.id], ['user_id = ?', id] + end + + foreign_keys = ['author_id', 'user_id', 'assigned_to_id'] + + # as updating the journals will take some time we do it in batches + # so that journals created later are also accounted for + while (journal_subset = Journal.all(:conditions => ["id > ?", current_id ||= 0], + :order => "id ASC", + :limit => USER_DELETION_JOURNAL_BUCKET_SIZE)).size > 0 do + + journal_subset.each do |journal| + change = journal.changes.dup + + foreign_keys.each do |foreign_key| + if journal.changes[foreign_key].present? + change[foreign_key] = change[foreign_key].map { |a_id| a_id == id ? substitute.id : a_id } + end + end + + journal.changes = change + journal.save if journal.changed? + end + + current_id = journal_subset.last.id + end + end + + def delete_associated_public_queries + Query.delete_all ['user_id = ? AND is_public = ?', id, false] + end end class AnonymousUser < User @@ -637,4 +693,25 @@ class AnonymousUser < User def mail; nil end def time_zone; nil end def rss_key; nil end + def destroy; false end +end + +class DeletedUser < User + def validate_on_create + # There should be only one DeletedUser in the database + errors.add_to_base 'A DeletedUser already exists.' if DeletedUser.find(:first) + end + + def self.first + find_or_create_by_type_and_status(self.to_s, User::STATUS_BUILTIN) + end + + # Overrides a few properties + def logged?; false end + def admin; false end + def name(*args); I18n.t('user.deleted') end + def mail; nil end + def time_zone; nil end + def rss_key; nil end + def destroy; false end end diff --git a/app/views/layouts/my.html.erb b/app/views/layouts/my.html.erb new file mode 100644 index 0000000000..8c29b19191 --- /dev/null +++ b/app/views/layouts/my.html.erb @@ -0,0 +1,5 @@ +<% content_for :sidebar do %> +<%= render :partial => 'my/sidebar' %> +<% end %> + +<%= render :file => "layouts/base" %> diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml index e9468dfab4..2e39c96c79 100644 --- a/app/views/my/account.rhtml +++ b/app/views/my/account.rhtml @@ -48,8 +48,4 @@ <% end %> -<% content_for :sidebar do %> -<%= render :partial => 'sidebar' %> -<% end %> - <% html_title(l(:label_my_account)) -%> diff --git a/app/views/my/password.rhtml b/app/views/my/password.rhtml index d6d09f16fb..1e244657c5 100644 --- a/app/views/my/password.rhtml +++ b/app/views/my/password.rhtml @@ -16,7 +16,3 @@ <%= submit_tag l(:button_apply) %> <% end %> - -<% content_for :sidebar do %> -<%= render :partial => 'sidebar' %> -<% end %> diff --git a/app/views/settings/_users.html.erb b/app/views/settings/_users.html.erb new file mode 100644 index 0000000000..f446b55532 --- /dev/null +++ b/app/views/settings/_users.html.erb @@ -0,0 +1,14 @@ +<% form_tag({ :action => 'edit', :tab => 'users' } ) do %> + +
+

+ <%= setting_check_box :users_deletable_by_admins %> +

+ +

+ <%= setting_check_box :users_deletable_by_self %> +

+ +
+<%= submit_tag l(:button_save) %> +<% end %> diff --git a/app/views/users/deletion_info.html.erb b/app/views/users/deletion_info.html.erb new file mode 100644 index 0000000000..410ddc943d --- /dev/null +++ b/app/views/users/deletion_info.html.erb @@ -0,0 +1,28 @@ +

<%=l('account.deletion_info.heading', :name => @user.name) %>

+<% form_for :user, :url => user_path(@user), :html => { :method => :delete, :class => 'confirm_required' } do |form| %> + +
+

+ <%= l("account.deletion_info.login_consequences.#{User.current == @user ? 'self' : 'other'}") %> +

+ +

+ <%= l("account.deletion_info.data_consequences.#{User.current == @user ? 'self' : 'other'}") %> +

+ +

+ <%= l("account.deletion_info.info.#{User.current == @user ? 'self' : 'other'}") %> +

+
+ +

+ <%= form.submit l(:button_delete) %> + <%= link_to l(:button_cancel), { :controller => 'my', :action => 'account' } %> +

+<% end %> + +<% javascript_tag do -%> + jQuery(document).ready(function() { + SubmitConfirm.init(jQuery('.confirm_required'), '<%= l('account.delete_confirmation') %>'); + }); +<% end -%> diff --git a/app/views/users/edit.rhtml b/app/views/users/edit.rhtml index ccf4489d20..5f0815e713 100644 --- a/app/views/users/edit.rhtml +++ b/app/views/users/edit.rhtml @@ -1,6 +1,9 @@
<%= link_to l(:label_profile), user_path(@user), :class => 'icon icon-user' %> <%= change_status_link(@user) %> +<% if Setting.users_deletable_by_admins? %> + <%= link_to l(:button_delete), { :controller => 'users', :action => 'deletion_info', :id => @user.id }, :class => 'icon icon-del' %> +<% end %>

<%= link_to l(:label_user_plural), :controller => 'users', :action => 'index' %> » <%=h @user.login %>

diff --git a/config/initializers/delayed_job_config.rb b/config/initializers/delayed_job_config.rb new file mode 100644 index 0000000000..399e3c1337 --- /dev/null +++ b/config/initializers/delayed_job_config.rb @@ -0,0 +1 @@ +Delayed::Worker.logger = Rails.logger diff --git a/config/locales/bg.yml b/config/locales/bg.yml index c8fcd1e184..0840c24cee 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -365,6 +365,8 @@ bg: setting_commit_logtime_enabled: Разрешаване на отчитането на работното време setting_commit_logtime_activity_id: Дейност при отчитане на работното време setting_gantt_items_limit: Максимален брой обекти, които да се показват в мрежов график + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Създаване на проект permission_add_subprojects: Създаване на подпроекти @@ -1008,3 +1010,29 @@ bg: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. + diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 8f52460172..a544793d17 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -301,7 +301,6 @@ bs: setting_host_name: Ime hosta i putanja setting_text_formatting: Formatiranje teksta setting_wiki_compression: Kompresija Wiki istorije - setting_feeds_limit: 'Limit za "RSS" feed-ove' setting_default_projects_public: Podrazumjeva se da je novi projekat javni setting_autofetch_changesets: 'Automatski kupi "commit"-e' @@ -330,6 +329,8 @@ bs: setting_file_max_size_displayed: Maksimalna veličina fajla kod prikaza razlika unutar fajla (inline) setting_repository_log_display_limit: Maksimalna veličina revizija prikazanih na log fajlu setting_openid: Omogući OpenID prijavu i registraciju + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_edit_project: Ispravke projekta permission_select_project_modules: Odaberi module projekta @@ -1022,3 +1023,29 @@ bs: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. + diff --git a/config/locales/ca.yml b/config/locales/ca.yml index d2cf15b7f9..39f800bdee 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -356,6 +356,8 @@ ca: setting_start_of_week: "Inicia les setmanes en" setting_rest_api_enabled: "Habilita el servei web REST" setting_cache_formatted_text: Cache formatted text + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: "Crea projectes" permission_add_subprojects: "Crea subprojectes" @@ -1011,3 +1013,28 @@ ca: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 4a178b20b1..4647406032 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -368,6 +368,8 @@ cs: setting_commit_logtime_enabled: Povolit zapisování času setting_commit_logtime_activity_id: Aktivita pro zapsaný čas setting_gantt_items_limit: Maximální počet položek zobrazený na ganttově grafu + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Vytvořit projekt permission_add_subprojects: Vytvořit podprojekty @@ -1232,3 +1234,28 @@ cs: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/da.yml b/config/locales/da.yml index 58f979a31b..bc3bc00dfb 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -306,6 +306,8 @@ da: setting_emails_footer: Email-fodnote setting_protocol: Protokol setting_user_format: Brugervisningsformat + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts project_module_issue_tracking: Sagssøgning project_module_time_tracking: Tidsstyring @@ -1024,3 +1026,28 @@ da: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/de.yml b/config/locales/de.yml index 03a1ce15eb..806a66df00 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -380,6 +380,8 @@ de: setting_rest_api_enabled: REST-Schnittstelle aktivieren setting_cache_formatted_text: Formatierten Text im Cache speichern setting_issue_startdate_is_adddate: Neue Tickets haben "Heute" als Anfangsdatum + setting_users_deletable_by_admins: Admins können Nutzeraccounts löschen + setting_users_deletable_by_self: Nutzer können ihren Account löschen permission_add_project: Projekt erstellen permission_add_subprojects: Unterprojekte erstellen @@ -1065,3 +1067,28 @@ de: label_issue_hierarchy: "Tickethierarchie" more_actions: Weitere Funktionen show_hide_project_menu: Projektnavigation aus/einblenden + + user: + deleted: "Gelöschter Nutzer" + + account: + delete: "Account löschen" + delete_confirmation: "Sind sie sicher, dass die den Account löschen wollen?" + deleted: "Account erfolgreich gelöscht" + deletion_info: + heading: "Lösche account %{name}" + info: + self: | + Das Löschen ihres Accounts kann nicht rückgängig gemacht werden. + other: | + Das Löschen des Accounts kann nicht rückgängig gemacht werden. + login_consequences: + self: | + Ihr Account wird aus dem System entfernt. Sie werden daher nicht mehr in der Lage, sein sich mit ihrem derzeitigen Nutzernamen und Passwort anzumelden. Sofern Sie es wünschen, können sie sich über die von der Anwendung zur Verfügung gestellten Mechanismen einen neuen Account zulegen. + other: | + Der Account wird aus dem System entfernt. Der Nutzer wird daher nicht mehr in der Lage sein, sich mit seinem derzeitigen Nutzernamen und Passwort anzumelden. Sofern der Nutzer es wünscht, kann er sich über die von der Anwendung zur Verfügung gestellten Mechanismen einen neuen Account zulegen. + data_consequences: + self: | + Von den von Ihnen im Zuge der Nutzung der Anwendung erstellen Daten (z.B. E-Mail-Adresse, Systemeinstellungen, Tickets, Wiki-Einträgen) werden so viele wie möglich gelöscht. Bitte beachten Sie allerdings, dass Daten wie Tickets und Wiki-Einträge nicht gelöscht werden können, da dies die Arbeit der anderen Nutzer behindern würde. Solche Daten werden daher einem "Gelöschten Nutzer" zugewiesen. Da die Daten aller gelöschter Accounts dem "Gelöschten Nutzer" zugewiesen werden ist es unmöglich die von ihnen erstellten Daten auf Ihre Person zurückzuführen. + other: | + Von den vom Nutzer im Zuge der Nutzung der Anwendung erstellen Daten (z.B. E-Mail-Adresse, Systemeinstellungen, Tickets, Wiki-Einträgen) werden so viele wie möglich gelöscht. Bitte beachten Sie allerdings, dass Daten wie Tickets und Wiki-Einträge nicht gelöscht werden können, da dies die Arbeit der anderen Nutzer behindern würde. Solche Daten werden daher einem "Gelöschten Nutzer" zugewiesen. Da die Daten aller gelöschter Accounts dem "Gelöschten Nutzer" zugewiesen werden ist es unmöglich die von Nutzer erstellten Daten auf seine Person zurückzuführen. diff --git a/config/locales/el.yml b/config/locales/el.yml index fe4a51da2f..ff9cde62b7 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -327,6 +327,8 @@ el: setting_openid: Επιτρέψτε συνδέσεις OpenID και εγγραφή setting_password_min_length: Ελάχιστο μήκος κωδικού πρόσβασης setting_new_project_user_role_id: Απόδοση ρόλου σε χρήστη μη-διαχειριστή όταν δημιουργεί ένα έργο + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Δημιουργία έργου permission_edit_project: Επεξεργασία έργου @@ -1008,3 +1010,28 @@ el: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index b75056d850..2dd78bb102 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -375,6 +375,8 @@ en-GB: setting_commit_logtime_activity_id: Activity for logged time setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_issue_startdate_is_adddate: Use current date as start date for new issues + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Create project permission_add_subprojects: Create subprojects @@ -1018,3 +1020,28 @@ en-GB: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/en.yml b/config/locales/en.yml index 643eebc146..bd1dc36e16 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -377,6 +377,8 @@ en: setting_commit_logtime_activity_id: Activity for logged time setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_issue_startdate_is_adddate: Use current date as start date for new issues + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Create project permission_add_subprojects: Create subprojects @@ -1046,3 +1048,30 @@ en: label_issue_hierarchy: "Issue Hierarchy" more_actions: More functions show_hide_project_menu: Hide/Show project menu + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. + + diff --git a/config/locales/es.yml b/config/locales/es.yml index 6828f20b41..43805aaef4 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -971,6 +971,8 @@ es: label_user_search: "Buscar por usuario:" field_visible: Visible setting_emails_header: Encabezado de Correos + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts setting_commit_logtime_activity_id: Activity for logged time text_time_logged_by_changeset: Applied in changeset %{value}. @@ -1045,3 +1047,28 @@ es: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 947213f788..a7ea1e637a 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -346,6 +346,8 @@ eu: setting_issue_done_ratio_issue_status: Zeregin egoera erabili setting_start_of_week: "Egutegiak noiz hasi:" setting_rest_api_enabled: Gaitu REST web zerbitzua + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Proiektua sortu permission_add_subprojects: Azpiproiektuak sortu @@ -1012,3 +1014,28 @@ eu: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 1ef1a989ff..b054f1147c 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -365,6 +365,8 @@ fa: setting_commit_logtime_enabled: فعالسازی زمان گذاشته شده setting_commit_logtime_activity_id: فعالیت زمان گذاشته شده setting_gantt_items_limit: بیشترین شمار بخش‌های نمایش داده شده در نمودار گانت + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: ساخت پروژه permission_add_subprojects: ساخت زیرپروژه @@ -1011,3 +1013,28 @@ fa: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 7b66aefabb..e1c50943cd 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -314,6 +314,8 @@ fi: setting_emails_footer: Sähköpostin alatunniste setting_protocol: Protokolla setting_per_page_options: Sivun objektien määrän asetukset + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts label_user: Käyttäjä label_user_plural: Käyttäjät @@ -1029,3 +1031,28 @@ fi: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/fr.yml b/config/locales/fr.yml index a386b81305..7282f0da8b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -368,6 +368,8 @@ fr: setting_commit_logtime_activity_id: Activité pour le temps saisi setting_gantt_items_limit: Nombre maximum d'éléments affichés sur le gantt setting_issue_startdate_is_adddate: Utiliser "aujourd'hui" comme début pour les nouvelles demandes + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Créer un projet permission_add_subprojects: Créer des sous-projets @@ -1026,3 +1028,28 @@ fr: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 43a274c763..13cb794385 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1020,3 +1020,28 @@ gl: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/he.yml b/config/locales/he.yml index e8aed9b8ee..635c30b2d2 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -360,6 +360,8 @@ he: setting_rest_api_enabled: אפשר שירות רשת REST setting_cache_formatted_text: שמור טקסט מעוצב במטמון setting_default_notification_option: אפשרות התראה ברירת־מחדל + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: יצירת פרויקט permission_add_subprojects: יצירת תתי־פרויקט @@ -1013,3 +1015,28 @@ he: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 47f9b8d24b..b677289880 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -341,6 +341,8 @@ hr: setting_issue_done_ratio_issue_status: Use the issue status setting_start_of_week: Start calendars on setting_rest_api_enabled: Enable REST web service + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Dodaj projekt permission_add_subprojects: Dodaj potprojekt @@ -1015,3 +1017,28 @@ hr: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/hu.yml b/config/locales/hu.yml index dd4c22f573..a11b5a2690 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -318,6 +318,8 @@ setting_activity_days_default: Napok megjelenítése a project aktivitásnál setting_display_subprojects_issues: Alapértelmezettként mutassa az alprojektek feladatait is a projekteken setting_start_of_week: A hét első napja + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts project_module_issue_tracking: Feladat követés project_module_time_tracking: Idő rögzítés @@ -1027,3 +1029,28 @@ text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/id.yml b/config/locales/id.yml index 6bdf320707..c37f35b0f8 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -334,6 +334,8 @@ id: setting_password_min_length: Panjang minimum untuk kata sandi setting_new_project_user_role_id: Peran diberikan pada pengguna non-admin yang membuat proyek setting_default_projects_modules: Modul yang diaktifkan pada proyek baru + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Tambahkan proyek permission_edit_project: Sunting proyek @@ -1016,3 +1018,28 @@ id: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/it.yml b/config/locales/it.yml index 9598f435b0..838085e9f4 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -275,6 +275,8 @@ it: setting_autologin: Connessione automatica setting_date_format: Formato data setting_cross_project_issue_relations: Consenti la creazione di relazioni tra segnalazioni in progetti differenti + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts label_user: Utente label_user_plural: Utenti @@ -1009,3 +1011,28 @@ it: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/ja.yml b/config/locales/ja.yml index cf444019e9..9ff8c12075 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -387,6 +387,8 @@ ja: setting_commit_logtime_enabled: コミット時に作業時間を記録する setting_commit_logtime_activity_id: 作業時間の作業分類 setting_gantt_items_limit: ガントチャート最大表示項目数 + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: プロジェクトの追加 permission_add_subprojects: サブプロジェクトの追加 @@ -1030,3 +1032,28 @@ ja: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 984f7a500a..6128bf78d6 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -375,6 +375,8 @@ ko: setting_openid: OpenID 로그인과 등록 허용 setting_password_min_length: 최소 암호 길이 setting_new_project_user_role_id: 프로젝트를 만든 사용자에게 주어질 역할 + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: 프로젝트 생성 permission_edit_project: 프로젝트 편집 @@ -1060,3 +1062,28 @@ ko: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 1a96d46e34..105bc911eb 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -390,6 +390,8 @@ lt: setting_password_min_length: Minimalus slaptažodžio ilgis setting_new_project_user_role_id: Vaidmuo, suteikiamas vartotojui (non-admin), kuris sukuria projektą setting_default_projects_modules: Nustatytieji naujam projektui priskirti moduliai + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Sukurti projektą permission_edit_project: Taisyti projektą @@ -1068,3 +1070,28 @@ lt: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 4c721302ab..257bf9a952 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -338,6 +338,8 @@ lv: setting_start_of_week: Sākt kalendāru ar setting_rest_api_enabled: Lietot REST web-servisu setting_cache_formatted_text: Kešot formatētu tekstu + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Izveidot projektu permission_add_subprojects: Izveidot apakšprojektu @@ -1003,3 +1005,28 @@ lv: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 39e6721b9e..e79d823efc 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -353,6 +353,8 @@ mk: setting_start_of_week: Start calendars on setting_rest_api_enabled: Enable REST web service setting_cache_formatted_text: Cache formatted text + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Креирај проекти permission_add_subprojects: Креирај подпроекти @@ -1008,3 +1010,28 @@ mk: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 5583ae968b..24b626f4e2 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -342,6 +342,8 @@ mn: setting_start_of_week: Start calendars on setting_rest_api_enabled: Enable REST web service setting_cache_formatted_text: Cache formatted text + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Create project permission_add_subprojects: Create subprojects @@ -1009,3 +1011,28 @@ mn: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/nl.yml b/config/locales/nl.yml index aded5643da..d0cea08087 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -990,3 +990,28 @@ nl: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/no.yml b/config/locales/no.yml index a83f33d167..355600ae76 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -289,6 +289,8 @@ setting_activity_days_default: Dager vist på prosjektaktivitet setting_display_subprojects_issues: Vis saker fra underprosjekter på hovedprosjekt som standard setting_enabled_scm: Aktiviserte SCM + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts project_module_issue_tracking: Sakssporing project_module_time_tracking: Tidssporing @@ -995,3 +997,28 @@ text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/pl.yml b/config/locales/pl.yml index e86474b243..020ea49b5a 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1025,3 +1025,28 @@ pl: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 85cf795fbe..7c60553689 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -327,6 +327,8 @@ pt-BR: setting_mail_handler_api_enabled: Habilitar WS para e-mails de entrada setting_mail_handler_api_key: Chave de API setting_sequential_project_identifiers: Gerar identificadores sequenciais de projeto + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts project_module_issue_tracking: Gerenciamento de Tarefas project_module_time_tracking: Gerenciamento de tempo @@ -1032,3 +1034,28 @@ pt-BR: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 6a988c01c6..2f1f845ca3 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -312,6 +312,8 @@ pt: setting_mail_handler_api_enabled: Activar Web Service para e-mails recebidos setting_mail_handler_api_key: Chave da API setting_sequential_project_identifiers: Gerar identificadores de projecto sequênciais + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts project_module_issue_tracking: Tarefas project_module_time_tracking: Registo de tempo @@ -1012,3 +1014,28 @@ pt: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 6db26dcaa9..3e2f6df105 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -309,6 +309,8 @@ ro: setting_file_max_size_displayed: Număr maxim de fișiere text afișate în pagină (inline) setting_repository_log_display_limit: Număr maxim de revizii afișate în istoricul fișierului setting_openid: Permite înregistrare și autentificare cu OpenID + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_edit_project: Editează proiectul permission_select_project_modules: Alege module pentru proiect @@ -1001,3 +1003,28 @@ ro: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 7cb0805399..bb23c8bfad 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -901,6 +901,8 @@ ru: setting_user_format: Формат отображения имени setting_welcome_text: Текст приветствия setting_wiki_compression: Сжатие истории Wiki + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts status_active: активен status_locked: заблокирован @@ -1121,3 +1123,28 @@ ru: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 58250680b6..10c5b2eba0 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -292,6 +292,8 @@ sk: setting_user_format: Formát zobrazenia užívateľa setting_activity_days_default: "Zobrazené dni aktivity projektu:" setting_display_subprojects_issues: Prednastavenie zobrazenia úloh podporojektov v hlavnom projekte + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts project_module_issue_tracking: Sledovanie úloh project_module_time_tracking: Sledovanie času @@ -1003,3 +1005,28 @@ sk: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 498f718e61..2f7d3062eb 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -306,6 +306,8 @@ sl: setting_sequential_project_identifiers: Generiraj projektne identifikatorje sekvenčno setting_gravatar_enabled: Uporabljaj Gravatar ikone setting_diff_max_lines_displayed: Maksimalno število prikazanih vrstic različnosti + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_edit_project: Uredi projekt permission_select_project_modules: Izberi module projekta @@ -1004,3 +1006,28 @@ sl: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index 16667add33..0705d0a464 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -352,6 +352,8 @@ sr-YU: setting_start_of_week: Prvi dan u sedmici setting_rest_api_enabled: Omogući REST web usluge setting_cache_formatted_text: Keširanje obrađenog teksta + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Kreiranje projekta permission_add_subprojects: Kreiranje potpojekta @@ -1008,3 +1010,28 @@ sr-YU: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/sr.yml b/config/locales/sr.yml index df166011f9..a57e3057c0 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -352,6 +352,8 @@ sr: setting_start_of_week: Први дан у седмици setting_rest_api_enabled: Омогући REST web услуге setting_cache_formatted_text: Кеширање обрађеног текста + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Креирање пројекта permission_add_subprojects: Креирање потпојекта @@ -1009,3 +1011,28 @@ sr: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 4262dbb183..4b0576c911 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -407,6 +407,8 @@ sv: setting_commit_logtime_enabled: Aktivera tidloggning setting_commit_logtime_activity_id: Aktivitet för loggad tid setting_gantt_items_limit: Maximalt antal aktiviteter som visas i gantt-schemat + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: Skapa projekt permission_add_subprojects: Skapa underprojekt @@ -1050,3 +1052,28 @@ sv: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/th.yml b/config/locales/th.yml index 178b748ad5..2c2ef9d279 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -294,6 +294,8 @@ th: setting_user_format: รูปแบบการแสดงชื่อผู้ใช้ setting_activity_days_default: จำนวนวันที่แสดงในกิจกรรมของโครงการ setting_display_subprojects_issues: แสดงปัญหาของโครงการย่อยในโครงการหลัก + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts project_module_issue_tracking: การติดตามปัญหา project_module_time_tracking: การใช้เวลา @@ -1005,3 +1007,28 @@ th: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/tr.yml b/config/locales/tr.yml index d03494a95f..6c04830149 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -317,6 +317,8 @@ tr: setting_user_format: Kullanıcı gösterim formatı setting_activity_days_default: Proje Faaliyetlerinde gösterilen gün sayısı setting_display_subprojects_issues: Varsayılan olarak ana projenin ileti listesinde alt proje iletilerini göster + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts project_module_issue_tracking: İleti Takibi project_module_time_tracking: Zaman Takibi @@ -1027,3 +1029,28 @@ tr: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 45a4be0ef6..098a87ec3a 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -281,6 +281,8 @@ uk: setting_repositories_encodings: Кодування репозиторія setting_emails_footer: Підпис до електронної пошти setting_protocol: Протокол + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts label_user: Користувач label_user_plural: Користувачі @@ -1004,3 +1006,28 @@ uk: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/vi.yml b/config/locales/vi.yml index edc8eec50d..6ca35da185 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -357,6 +357,8 @@ vi: setting_mail_handler_api_enabled: Enable WS for incoming emails setting_mail_handler_api_key: Mã số API setting_sequential_project_identifiers: Tự sinh chuỗi ID dự án + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts project_module_issue_tracking: Theo dõi vấn đề project_module_time_tracking: Theo dõi thời gian @@ -1059,3 +1061,28 @@ vi: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 3b2f72814c..ceafcb86ee 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -447,6 +447,8 @@ setting_commit_logtime_enabled: 啟用送交中的時間記錄 setting_commit_logtime_activity_id: 時間記錄對應的活動 setting_gantt_items_limit: 甘特圖中項目顯示數量的最大值 + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: 建立專案 permission_add_subprojects: 建立子專案 @@ -1090,3 +1092,28 @@ text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/locales/zh.yml b/config/locales/zh.yml index b79b50dc53..8d9ac88e14 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -357,6 +357,8 @@ zh: setting_issue_done_ratio_issue_status: 使用问题状态 setting_start_of_week: 日历开始于 setting_rest_api_enabled: 启用REST web service + setting_users_deletable_by_admins: User accounts deletable by admins + setting_users_deletable_by_self: Users allowed to delete their accounts permission_add_project: 新建项目 permission_add_subprojects: 新建子项目 @@ -1022,3 +1024,28 @@ zh: text_analyze: "Further analyze: %{subject}" label_project_view_all: View all projects description_subissue: Subissue of + + user: + deleted: "Deleted user" + + account: + delete: "Delete account" + delete_confirmation: "Are you sure you want to delete the account?" + deleted: "Account successfully deleted" + deletion_info: + heading: "Delete account %{name}" + info: + self: | + Deleting your user account is an irreversible action. + other: | + Deleting the user account is an irreversible action. + login_consequences: + self: | + Your account will be deleted from the system. Therefore, you will no longer be able to log in with your current credentials. If you choose to become a user of this application again, you can do so by using the means this application grants. + other: | + The account will be deleted from the system. Therefore, the user will no longer be able to log in with his current credentials. He/she can choose to become a user of this application again by the means this application grants. + data_consequences: + self: | + Of the data you created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data you created from the data of another deleted account. + other: | + Of the data the user created (e.g. e-mail, preferences, issues, wiki entries) as much as possible will be deleted. Note however, that data like issues and wiki entries can not be deleted without impeding the work of the other users. Such data is hence reassigned to an account called "Deleted user". As the data of every deleted account is reassigned to this account it will not be possible to distinguish the data the user created from the data of another deleted account. diff --git a/config/routes.rb b/config/routes.rb index 7d55aa99b7..0c9d4a6b13 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -136,9 +136,9 @@ ActionController::Routing::Routes.draw do |map| map.resources :users, :member => { :edit_membership => :post, - :destroy_membership => :post - }, - :except => [:destroy] + :destroy_membership => :post, + :deletion_info => :get + } # For nice "roadmap" in the url for the index action map.connect 'projects/:project_id/roadmap', :controller => 'versions', :action => 'index' @@ -253,6 +253,13 @@ ActionController::Routing::Routes.draw do |map| sys.connect 'sys/projects/:id/repository.:format', :action => 'create_project_repository', :conditions => {:method => :post} end + # alternate routes for the current user + map.with_options :path_prefix => "my" do |my| + my.delete_my_account_info 'deletion_info', :controller => 'users', + :action => 'deletion_info', + :conditions => { :method => :get } + end + # Install the default route as the lowest priority. map.connect ':controller/:action/:id' map.connect 'robots.txt', :controller => 'welcome', :action => 'robots' diff --git a/config/settings.yml b/config/settings.yml index 3681327cf4..e700ccfb6b 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -188,3 +188,7 @@ emails_header: en: '' issue_startdate_is_adddate: default: 1 +users_deletable_by_admins: + default: 0 +users_deletable_by_self: + default: 0 diff --git a/db/migrate/20120529090411_create_delayed_jobs.rb b/db/migrate/20120529090411_create_delayed_jobs.rb new file mode 100644 index 0000000000..ac579dfcd7 --- /dev/null +++ b/db/migrate/20120529090411_create_delayed_jobs.rb @@ -0,0 +1,21 @@ +class CreateDelayedJobs < ActiveRecord::Migration + def self.up + create_table :delayed_jobs, :force => true do |table| + table.integer :priority, :default => 0 # Allows some jobs to jump to the front of the queue + table.integer :attempts, :default => 0 # Provides for retries, but still fail eventually. + table.text :handler # YAML-encoded string of the object that will do work + table.text :last_error # reason for last failure (See Note below) + table.datetime :run_at # When to run. Could be Time.zone.now for immediately, or sometime in the future. + table.datetime :locked_at # Set when a client is working on this object + table.datetime :failed_at # Set when all retries have failed (actually, by default, the record is deleted instead) + table.string :locked_by # Who is working on this object (if locked) + table.timestamps + end + + add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority' + end + + def self.down + drop_table :delayed_jobs + end +end \ No newline at end of file diff --git a/lib/redmine.rb b/lib/redmine.rb index 3d5b3a21c8..a4863a8b8c 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -184,6 +184,10 @@ end Redmine::MenuManager.map :my_menu do |menu| menu.push :account, {:controller => 'my', :action => 'account'}, :caption => :label_my_account menu.push :password, {:controller => 'my', :action => 'password'}, :caption => :button_change_password, :if => Proc.new { User.current.change_password_allowed? } + menu.push :delete_account, :deletion_info_path, + :caption => I18n.t('account.delete'), + :param => :user_id, + :if => Proc.new { Setting.users_deletable_by_self? } end Redmine::MenuManager.map :admin_menu do |menu| diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 0b7abce4c9..8c644f4908 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1153,3 +1153,19 @@ var I18nForms = (function ($) { }(jQuery)); jQuery(document).ready(I18nForms.init); + +var SubmitConfirm = (function($) { + var init; + + init = function(element, question) { + element.submit(function() { + if(!confirm(question)) { + return false; + } + }); + }; + + return { + init: init + } +})(jQuery); diff --git a/script/delayed_job b/script/delayed_job new file mode 100755 index 0000000000..edf195985f --- /dev/null +++ b/script/delayed_job @@ -0,0 +1,5 @@ +#!/usr/bin/env ruby + +require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment')) +require 'delayed/command' +Delayed::Command.new(ARGV).daemonize