diff --git a/Gemfile b/Gemfile index 6e29c213f..c7115be76 100644 --- a/Gemfile +++ b/Gemfile @@ -67,6 +67,12 @@ group :development, :test do gem 'simplecov', require: false end +group :test do + gem 'capybara' + gem 'chromedriver-helper' + gem 'selenium-webdriver' +end + group :development do gem 'bullet' gem 'fit-commit' diff --git a/Gemfile.lock b/Gemfile.lock index b23ace7a5..e1d6f0115 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,6 +49,8 @@ GEM nokogiri ancestry (3.0.2) activerecord (>= 3.2.0) + archive-zip (0.11.0) + io-like (~> 0.3.0) arel (9.0.0) ast (2.4.0) aws-eventstream (1.0.1) @@ -83,7 +85,19 @@ GEM bundler (~> 1.2) thor (~> 0.18) byebug (10.0.2) + capybara (3.8.2) + addressable + mini_mime (>= 0.1.3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.1) chartkick (3.0.1) + childprocess (0.9.0) + ffi (~> 1.0, >= 1.0.11) + chromedriver-helper (2.1.0) + archive-zip (~> 0.10) + nokogiri (~> 1.8) cocoon (1.2.11) codacy-coverage (2.1.0) simplecov @@ -143,6 +157,7 @@ GEM image_processing (1.7.0) mini_magick (~> 4.0) ruby-vips (>= 2.0.13, < 3) + io-like (0.3.0) jaro_winkler (1.5.1) jbuilder (2.7.0) activesupport (>= 4.2.0) @@ -253,6 +268,7 @@ GEM ruby-vips (2.0.13) ffi (~> 1.9) ruby_dep (1.5.0) + rubyzip (1.2.2) sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -276,6 +292,9 @@ GEM nokogiri (>= 1.8.1) nori (~> 2.4) wasabi (~> 3.4) + selenium-webdriver (3.14.0) + childprocess (~> 0.5) + rubyzip (~> 1.2) sidekiq (5.2.2) connection_pool (~> 2.2, >= 2.2.2) rack-protection (>= 1.5.0) @@ -334,6 +353,8 @@ GEM websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.3) + xpath (3.1.0) + nokogiri (~> 1.8) PLATFORMS ruby @@ -347,7 +368,9 @@ DEPENDENCIES bullet bundler-audit byebug + capybara chartkick + chromedriver-helper cocoon codacy-coverage coffee-rails (~> 4.2) @@ -375,6 +398,7 @@ DEPENDENCIES ruby-progressbar sassc-rails savon (~> 2.12.0) + selenium-webdriver sidekiq simple_form simplecov diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index b555b4912..7d9c1e040 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -4,4 +4,5 @@ *= require coreui *= require toastr/build/toastr.min *= require select2/dist/css/select2.min + *= require custom/select2 */ diff --git a/app/assets/stylesheets/custom/select2.css b/app/assets/stylesheets/custom/select2.css new file mode 100644 index 000000000..d0f9442a9 --- /dev/null +++ b/app/assets/stylesheets/custom/select2.css @@ -0,0 +1,3 @@ +.select2 { + width: 100% !important; /* csslint allow: known-properties, important */ +} \ No newline at end of file diff --git a/app/controllers/account/duties_controller.rb b/app/controllers/account/duties_controller.rb index 296d20ff9..beaa5d1e3 100644 --- a/app/controllers/account/duties_controller.rb +++ b/app/controllers/account/duties_controller.rb @@ -21,7 +21,11 @@ def update end def destroy - @duty.destroy ? redirect_to(@user, notice: t('.success')) : redirect_with('warning') + if @duty.destroy + redirect_to(@user, notice: t('.success')) + else + redirect_to(users_path(@user), alert: t('.warning')) + end end private diff --git a/app/controllers/account/employees_controller.rb b/app/controllers/account/employees_controller.rb index 266fded8f..f08988924 100644 --- a/app/controllers/account/employees_controller.rb +++ b/app/controllers/account/employees_controller.rb @@ -21,7 +21,11 @@ def update end def destroy - @employee.destroy ? redirect_to(@user, notice: t('.success')) : redirect_with('warning') + if @employee.destroy + redirect_to(@user, notice: t('.success')) + else + redirect_to(users_path(@user), alert: t('.warning')) + end end private diff --git a/app/controllers/account/positions_controller.rb b/app/controllers/account/positions_controller.rb index 53ef2f030..bd0d1bcc2 100644 --- a/app/controllers/account/positions_controller.rb +++ b/app/controllers/account/positions_controller.rb @@ -22,7 +22,11 @@ def update end def destroy - @position.destroy ? redirect_to(@user, notice: t('.success')) : redirect_with('warning') + if @position.destroy + redirect_to(@user, notice: t('.success')) + else + redirect_to(users_path(@user), alert: t('.warning')) + end end private diff --git a/app/controllers/concerns/reference_resource.rb b/app/controllers/concerns/reference_resource.rb index e74958867..96e8adf67 100644 --- a/app/controllers/concerns/reference_resource.rb +++ b/app/controllers/concerns/reference_resource.rb @@ -11,7 +11,7 @@ module ReferenceResource before_action :set_resource, only: %i[edit update destroy] def index - value = pagy_by_search(@model_name.order(:code)) + value = pagy_by_search(@model_name.order(:name)) instance_variable_set("@#{controller_name}", value) end diff --git a/app/controllers/course_management/course_group_types_controller.rb b/app/controllers/course_management/course_group_types_controller.rb index a18d67583..ca8176819 100644 --- a/app/controllers/course_management/course_group_types_controller.rb +++ b/app/controllers/course_management/course_group_types_controller.rb @@ -7,7 +7,7 @@ class CourseGroupTypesController < ApplicationController before_action :set_course_group_type, only: %i[edit update destroy] def index - @course_group_types = pagy_by_search(CourseGroupType.all) + @course_group_types = pagy_by_search(CourseGroupType.order(:name)) end def new @@ -26,7 +26,11 @@ def update end def destroy - @course_group_type.destroy ? redirect_with('success') : redirect_with('warning') + if @course_group_type.destroy + redirect_with('success') + else + redirect_to(course_group_types_path, alert: t('.warning')) + end end private diff --git a/app/controllers/course_management/courses_controller.rb b/app/controllers/course_management/courses_controller.rb index 27b27cbae..537bc8f61 100644 --- a/app/controllers/course_management/courses_controller.rb +++ b/app/controllers/course_management/courses_controller.rb @@ -7,7 +7,7 @@ class CoursesController < ApplicationController before_action :set_course, only: %i[show edit update destroy] def index - courses = Course.includes(:unit) + courses = Course.includes(:unit, :language) .dynamic_search(search_params(Course)) @pagy, @courses = pagy(courses) end diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb index 43312eb85..fccc1351f 100644 --- a/app/controllers/documents_controller.rb +++ b/app/controllers/documents_controller.rb @@ -6,7 +6,7 @@ class DocumentsController < ApplicationController before_action :set_document, only: %i[edit update destroy show] def index - @pagy, @documents = pagy(Document.all) + @pagy, @documents = pagy(Document.order(:name)) end def show; end @@ -27,7 +27,11 @@ def update end def destroy - @document.destroy ? redirect_to(documents_path, notice: t('.success')) : redirect_with('warning') + if @document.destroy + redirect_to(documents_path, notice: t('.success')) + else + redirect_to(documents_path, alert: t('.warning')) + end end private diff --git a/app/controllers/references/cities_controller.rb b/app/controllers/references/cities_controller.rb index 599fe1991..27e688ef2 100644 --- a/app/controllers/references/cities_controller.rb +++ b/app/controllers/references/cities_controller.rb @@ -27,7 +27,11 @@ def update end def destroy - @city.destroy ? redirect_to(@country, notice: t('.success')) : redirect_with('warning') + if @city.destroy + redirect_to(@country, notice: t('.success')) + else + redirect_to(@country, alert: t('.warning')) + end end private diff --git a/app/controllers/references/countries_controller.rb b/app/controllers/references/countries_controller.rb index 8c37507e0..e62c2a319 100644 --- a/app/controllers/references/countries_controller.rb +++ b/app/controllers/references/countries_controller.rb @@ -30,7 +30,11 @@ def update end def destroy - @country.destroy ? redirect_to(countries_path, notice: t('.success')) : redirect_with('warning') + if @country.destroy + redirect_to(countries_path, notice: t('.success')) + else + redirect_to(countries_path, alert: t('.warning')) + end end private diff --git a/app/controllers/references/districts_controller.rb b/app/controllers/references/districts_controller.rb index e64a5757a..48076a4ea 100644 --- a/app/controllers/references/districts_controller.rb +++ b/app/controllers/references/districts_controller.rb @@ -21,7 +21,11 @@ def update end def destroy - @district.destroy ? redirect_to([@city.country, @city], notice: t('.success')) : redirect_with('warning') + if @district.destroy + redirect_to([@city.country, @city], notice: t('.success')) + else + redirect_to([@city.country, @city], alert: t('.warning')) + end end private diff --git a/app/controllers/references/home_controller.rb b/app/controllers/references/home_controller.rb new file mode 100644 index 000000000..695b629a0 --- /dev/null +++ b/app/controllers/references/home_controller.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +module References + class HomeController < ApplicationController + def index; end + end +end diff --git a/app/controllers/references/languages_controller.rb b/app/controllers/references/languages_controller.rb index 9a278c0e7..6dc30ed19 100644 --- a/app/controllers/references/languages_controller.rb +++ b/app/controllers/references/languages_controller.rb @@ -26,7 +26,11 @@ def update end def destroy - @language.destroy ? redirect_to(languages_path, notice: t('.success')) : redirect_with('warning') + if @language.destroy + redirect_to(languages_path, notice: t('.success')) + else + redirect_to(languages_path, alert: t('.warning')) + end end private diff --git a/app/controllers/registration_documents_controller.rb b/app/controllers/registration_documents_controller.rb index 23fc3334c..d26b33f26 100644 --- a/app/controllers/registration_documents_controller.rb +++ b/app/controllers/registration_documents_controller.rb @@ -26,7 +26,11 @@ def update end def destroy - @registration_document.destroy ? redirect_to(@unit, notice: t('.success')) : redirect_with('warning') + if @registration_document.destroy + redirect_to(@unit, notice: t('.success')) + else + redirect_to(@unit, alert: t('.warning')) + end end private diff --git a/app/controllers/student_management/prospective_students_controller.rb b/app/controllers/student_management/prospective_students_controller.rb index d5b654df3..5a66f1d0a 100644 --- a/app/controllers/student_management/prospective_students_controller.rb +++ b/app/controllers/student_management/prospective_students_controller.rb @@ -4,23 +4,45 @@ module StudentManagement class ProspectiveStudentsController < ApplicationController include PagyBackendWithHelpers - before_action :set_prospective_student, only: %i[show] + before_action :set_prospective_student, only: %i[show register] + before_action :can_register?, only: :register def index - prospective_students = ProspectiveStudent.includes(:unit).dynamic_search(search_params(ProspectiveStudent)) + prospective_students = ProspectiveStudent.includes(:unit, :student_entrance_type) + .dynamic_search(search_params(ProspectiveStudent)) @pagy, @prospective_students = pagy(prospective_students) end def show; end - private + def register + prospective_student = ProspectiveStudentService.new(@prospective_student) + user = prospective_student.create_user - def redirect_with(message) - redirect_to prospective_students_path, flash: { info: t(".#{message}") } + if user.save + student = prospective_student.create_student + student.save ? redirect_with_success : redirect_with_warning('.warning') + else + redirect_with_warning('.warning') + end end + private + def set_prospective_student @prospective_student = ProspectiveStudent.find(params[:id]) end + + def can_register? + redirect_with_warning('.can_not_register') unless @prospective_student.can_temporarily_register? + end + + def redirect_with_success + redirect_to(prospective_students_path, flash: { notice: t('.success') }) + end + + def redirect_with_warning(message) + redirect_to(prospective_students_path, flash: { alert: t(".#{message}") }) + end end end diff --git a/app/controllers/units_controller.rb b/app/controllers/units_controller.rb index 983ac0d02..ce8c3ae2e 100644 --- a/app/controllers/units_controller.rb +++ b/app/controllers/units_controller.rb @@ -30,7 +30,11 @@ def update end def destroy - @unit.destroy ? redirect_to(units_path, notice: t('.success')) : redirect_with('warning') + if @unit.destroy + redirect_to(units_path, notice: t('.success')) + else + redirect_to(units_path, alert: t('.warning')) + end end def courses diff --git a/app/jobs/osym/import_prospective_students_job.rb b/app/jobs/osym/import_prospective_students_job.rb index 90e9de590..c699862ca 100644 --- a/app/jobs/osym/import_prospective_students_job.rb +++ b/app/jobs/osym/import_prospective_students_job.rb @@ -73,7 +73,8 @@ def perform military_status_date: parse_date(military_status_date), obs_status: obs_status.eql?('0') ? true : false, obs_status_date: parse_date(obs_status_date), - obs_registered_program: obs_registered_program + obs_registered_program: obs_registered_program, + student_entrance_type: StudentEntranceType.find_by(code: 1) # TODO: will be dynamic in the future ) progress_bar.increment end diff --git a/app/models/academic_calendar.rb b/app/models/academic_calendar.rb index 6c7435ed9..3d451f891 100644 --- a/app/models/academic_calendar.rb +++ b/app/models/academic_calendar.rb @@ -1,6 +1,14 @@ # frozen_string_literal: true class AcademicCalendar < ApplicationRecord + # search + include PgSearch + pg_search_scope( + :search, + against: %i[name], + using: { tsearch: { prefix: true } } + ) + # relations belongs_to :academic_term belongs_to :calendar_type diff --git a/app/models/concerns/dynamic_search.rb b/app/models/concerns/dynamic_search.rb index 74ba73bc0..b6aa5087d 100644 --- a/app/models/concerns/dynamic_search.rb +++ b/app/models/concerns/dynamic_search.rb @@ -16,9 +16,10 @@ def dynamic_search_keys def dynamic_search(params = {}) raise ArgumentError, 'parameter must be Hash' unless [ActionController::Parameters, Hash].include?(params.class) - return search(params[:term]) if params[:term].present? - dynamic_where(params) + results = dynamic_where(params) + + params[:term].present? ? results.search(params[:term]) : results end private diff --git a/app/models/language.rb b/app/models/language.rb index b8e79baa1..0cc4f0a1d 100644 --- a/app/models/language.rb +++ b/app/models/language.rb @@ -5,7 +5,7 @@ class Language < ApplicationRecord include PgSearch pg_search_scope( :search, - against: %i[name iso yoksis_code], + against: %i[name iso], using: { tsearch: { prefix: true } } ) diff --git a/app/models/prospective_student.rb b/app/models/prospective_student.rb index 0c8473f96..b3450ecdc 100644 --- a/app/models/prospective_student.rb +++ b/app/models/prospective_student.rb @@ -11,13 +11,14 @@ class ProspectiveStudent < ApplicationRecord using: { tsearch: { prefix: true } } ) - search_keys :meb_status, :military_status, :obs_status, :unit_id + search_keys :meb_status, :military_status, :obs_status, :unit_id, :student_entrance_type_id # relations belongs_to :unit belongs_to :language, optional: true belongs_to :student_disability_type, optional: true belongs_to :high_school_type, optional: true + belongs_to :student_entrance_type # validations validates :id_number, presence: true, uniqueness: { scope: %i[unit_id exam_score] } @@ -39,4 +40,13 @@ class ProspectiveStudent < ApplicationRecord enum nationality: { turkish: 1, kktc: 2, foreign: 3 } enum placement_type: { general: 1, additional_score: 2 } enum additional_score: { handicapped: 1 } + + # custom methods + def can_permanently_register? + military_status && obs_status && meb_status + end + + def can_temporarily_register? + military_status + end end diff --git a/app/models/student_entrance_type.rb b/app/models/student_entrance_type.rb index d7a1364e7..af54c1d51 100644 --- a/app/models/student_entrance_type.rb +++ b/app/models/student_entrance_type.rb @@ -3,4 +3,6 @@ class StudentEntranceType < ApplicationRecord include ReferenceValidations include ReferenceCallbacks + + has_many :prospective_students, dependent: :destroy end diff --git a/app/services/prospective_student_service.rb b/app/services/prospective_student_service.rb new file mode 100644 index 000000000..ce1779545 --- /dev/null +++ b/app/services/prospective_student_service.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +class ProspectiveStudentService + def initialize(prospective_student) + @prospective_student = prospective_student + end + + def create_user + User.new( + id_number: @prospective_student.id_number, + email: @prospective_student.email, + password: @prospective_student.id_number, + password_confirmation: @prospective_student.id_number + ) + end + + def create_student + Student.new( + user: User.find_by(id_number: @prospective_student.id_number), + unit: @prospective_student.unit, + permanently_registered: @prospective_student.can_permanently_register? ? true : false, + student_number: @prospective_student.id_number # must be generated + ) + end +end diff --git a/app/views/account/employees/_form.html.erb b/app/views/account/employees/_form.html.erb index 181e6d7c0..c30f8fe8b 100644 --- a/app/views/account/employees/_form.html.erb +++ b/app/views/account/employees/_form.html.erb @@ -16,7 +16,7 @@ <%= f.input :title_id, collection: Title.all, required: true %>
- <%= f.input :active, required: true %> + <%= f.input :active %>
<%= f.button :submit, class: 'btn btn-outline-success btn-sm' %> diff --git a/app/views/calendar/academic_calendars/index.html.erb b/app/views/calendar/academic_calendars/index.html.erb index a7da93781..eb7d25e95 100644 --- a/app/views/calendar/academic_calendars/index.html.erb +++ b/app/views/calendar/academic_calendars/index.html.erb @@ -9,13 +9,9 @@ <%= fa_icon 'align-justify', text: t('.card_header') %>
- <%= form_tag academic_calendars_path, method: :get do %> -
- <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %> -
- <%= submit_tag t('search'), class: 'btn btn-primary' %> - <% end %> -
+ <%= render 'components/smart_search_form', + path: academic_calendars_path, + placeholder: t('.name') %> diff --git a/app/views/calendar/calendar_titles/index.html.erb b/app/views/calendar/calendar_titles/index.html.erb index ac887aa0c..d014e5773 100644 --- a/app/views/calendar/calendar_titles/index.html.erb +++ b/app/views/calendar/calendar_titles/index.html.erb @@ -9,13 +9,9 @@ <%= fa_icon 'align-justify', text: t('.card_header') %>
- <%= form_tag calendar_titles_path, method: :get do %> -
- <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %> -
- <%= submit_tag t('search'), class: 'btn btn-primary' %> - <% end %> -
+ <%= render 'components/smart_search_form', + path: calendar_titles_path, + placeholder: t('.name') %>
diff --git a/app/views/committee/agenda_types/index.html.erb b/app/views/committee/agenda_types/index.html.erb index 81c8f04e3..5fe0bb3f0 100644 --- a/app/views/committee/agenda_types/index.html.erb +++ b/app/views/committee/agenda_types/index.html.erb @@ -9,13 +9,9 @@ <%= fa_icon 'tags', text: t('.card_header') %>
- <%= form_tag agenda_types_path, method: :get do %> -
- <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %> -
- <%= submit_tag t('search'), class: 'btn btn-primary' %> - <% end %> -
+ <%= render 'components/smart_search_form', + path: agenda_types_path, + placeholder: t('.name') %>
diff --git a/app/views/committee/agendas/_search.html.erb b/app/views/committee/agendas/_search.html.erb index 77825a903..ba8183c7d 100644 --- a/app/views/committee/agendas/_search.html.erb +++ b/app/views/committee/agendas/_search.html.erb @@ -1,51 +1,53 @@
- - <%= render 'layouts/shared/smart_search', - search_path: committee_agendas_path, - placeholder: t('.smart_search_placeholder') %> -
-
diff --git a/app/views/committee/dashboard/show.html.erb b/app/views/committee/dashboard/show.html.erb index 0fb173f79..168c607ab 100644 --- a/app/views/committee/dashboard/show.html.erb +++ b/app/views/committee/dashboard/show.html.erb @@ -13,13 +13,9 @@
- <%= form_tag committee_path(@committee.id), method: :get do %> -
- <%= text_field_tag 'term', params[:term], placeholder: t('.description'), class: 'form-control' %> -
- <%= submit_tag t('search'), class: 'btn btn-primary' %> - <% end %> -
+ <%= render 'components/smart_search_form', + path: committee_path(@committee.id), + placeholder: t('.description') %>
diff --git a/app/views/layouts/shared/_smart_search.html.erb b/app/views/components/_smart_search_form.html.erb similarity index 94% rename from app/views/layouts/shared/_smart_search.html.erb rename to app/views/components/_smart_search_form.html.erb index 3b249bef9..223309b43 100644 --- a/app/views/layouts/shared/_smart_search.html.erb +++ b/app/views/components/_smart_search_form.html.erb @@ -16,7 +16,7 @@ aria-labelledby="smartSearch" data-parent="#SearchForms">
- <%= form_tag search_path, method: :get do %> + <%= form_tag path, method: :get do %>
<%= text_field_tag :term, params[:term], diff --git a/app/views/course_management/course_group_types/index.html.erb b/app/views/course_management/course_group_types/index.html.erb index b897889f5..77f159654 100644 --- a/app/views/course_management/course_group_types/index.html.erb +++ b/app/views/course_management/course_group_types/index.html.erb @@ -9,13 +9,9 @@ <%= fa_icon 'tags', text: t('.card_header') %>
- <%= form_tag course_group_types_path, method: :get do %> -
- <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %> -
- <%= submit_tag t('search'), class: 'btn btn-primary' %> - <% end %> -
+ <%= render 'components/smart_search_form', + path: course_group_types_path, + placeholder: t('.name') %>
diff --git a/app/views/course_management/course_unit_groups/_form.html.erb b/app/views/course_management/course_unit_groups/_form.html.erb index 6c06090bd..019dbdee7 100644 --- a/app/views/course_management/course_unit_groups/_form.html.erb +++ b/app/views/course_management/course_unit_groups/_form.html.erb @@ -18,7 +18,7 @@ <%= f.input :total_ects_condition, required: true, input_html: { min: 0 } %>
- <%= f.association :unit, collection: Unit.without_programs %> + <%= f.association :unit, collection: Unit.active.without_programs.order(:name) %>
<%= f.association :course_group_type %> diff --git a/app/views/course_management/course_unit_groups/index.html.erb b/app/views/course_management/course_unit_groups/index.html.erb index 7a9ff00ce..d7f572947 100644 --- a/app/views/course_management/course_unit_groups/index.html.erb +++ b/app/views/course_management/course_unit_groups/index.html.erb @@ -9,13 +9,9 @@ <%= fa_icon 'tags', text: t('.card_header') %>
- <%= form_tag course_unit_groups_path, method: :get do %> -
- <%= text_field_tag 'term', params[:term], placeholder: t('.search_placeholder'), class: 'form-control' %> -
- <%= submit_tag t('search'), class: 'btn btn-primary' %> - <% end %> -
+ <%= render 'components/smart_search_form', + path: course_unit_groups_path, + placeholder: t('.search_placeholder') %>
diff --git a/app/views/course_management/courses/_form.html.erb b/app/views/course_management/courses/_form.html.erb index a22161f39..0fb3673b3 100644 --- a/app/views/course_management/courses/_form.html.erb +++ b/app/views/course_management/courses/_form.html.erb @@ -19,7 +19,7 @@ <% end %>
- <%= f.association :unit %> + <%= f.association :unit, collection: Unit.coursable.active.order(:name) %>
<%= f.input :name %> @@ -28,13 +28,13 @@ <%= f.input :code %>
- <%= f.input :theoric %> + <%= f.input :theoric, input_html: { min: 0 } %>
- <%= f.input :practice %> + <%= f.input :practice, input_html: { min: 0 } %>
- <%= f.input :laboratory %> + <%= f.input :laboratory, input_html: { min: 0 } %>
<%= f.input :program_type, diff --git a/app/views/course_management/courses/_search.html.erb b/app/views/course_management/courses/_search.html.erb index 2909ab50b..cf19ed0a6 100644 --- a/app/views/course_management/courses/_search.html.erb +++ b/app/views/course_management/courses/_search.html.erb @@ -1,38 +1,42 @@
- - <%= render 'layouts/shared/smart_search', - search_path: courses_path, - placeholder: t('.smart_search_placeholder') %> -
-
diff --git a/app/views/references/countries/index.html.erb b/app/views/references/countries/index.html.erb index c215b6d86..14aee9dea 100644 --- a/app/views/references/countries/index.html.erb +++ b/app/views/references/countries/index.html.erb @@ -9,13 +9,9 @@ <%= fa_icon 'street-view', text: t('.card_header') %>
- <%= form_tag countries_path, method: :get do %> -
- <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %> -
- <%= submit_tag t('search'), class: 'btn btn-primary' %> - <% end %> -
+ <%= render 'components/smart_search_form', + path: countries_path, + placeholder: t('.name') %>
diff --git a/app/views/references/countries/show.html.erb b/app/views/references/countries/show.html.erb index 585a8b81e..7bfc8c138 100644 --- a/app/views/references/countries/show.html.erb +++ b/app/views/references/countries/show.html.erb @@ -49,13 +49,9 @@
- <%= form_tag country_path(@country), method: :get do %> -
- <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %> -
- <%= submit_tag t('search'), class: 'btn btn-primary' %> - <% end %> -
+ <%= render 'components/smart_search_form', + path: country_path(@country), + placeholder: t('.name') %>
diff --git a/app/views/references/home/_card.html.erb b/app/views/references/home/_card.html.erb new file mode 100644 index 000000000..d4920e385 --- /dev/null +++ b/app/views/references/home/_card.html.erb @@ -0,0 +1,12 @@ +
+
+
+
<%= t(title) %>
+
<%= content %>
+ <%= link_to path, class: 'btn btn-block btn-secondary' do %> + <%= t('action_group.show') %> + + <% end %> +
+
+
\ No newline at end of file diff --git a/app/views/references/home/index.html.erb b/app/views/references/home/index.html.erb new file mode 100644 index 000000000..609b033c7 --- /dev/null +++ b/app/views/references/home/index.html.erb @@ -0,0 +1,18 @@ +
+ <%= render 'card', content: HighSchoolType.count, title: '.high_school_types', path: high_school_types_path %> + <%= render 'card', content: StudentDisabilityType.count, title: '.student_disability_types', path: student_disability_types_path %> + <%= render 'card', content: StudentDropOutType.count, title: '.student_drop_out_types', path: student_drop_out_types_path %> + <%= render 'card', content: StudentEducationLevel.count, title: '.student_education_levels', path: student_education_levels_path %> + <%= render 'card', content: StudentEntrancePointType.count, title: '.student_entrance_point_types', path: student_entrance_point_types_path %> + <%= render 'card', content: StudentEntranceType.count, title: '.student_entrance_types', path: student_entrance_types_path %> + <%= render 'card', content: StudentGrade.count, title: '.student_grades', path: student_grades_path %> + <%= render 'card', content: StudentGradingSystem.count, title: '.student_grading_systems', path: student_grading_systems_path %> + <%= render 'card', content: StudentPunishmentType.count, title: '.student_punishment_types', path: student_punishment_types_path %> + <%= render 'card', content: StudentStudentshipStatus.count, title: '.student_studentship_statuses', path: student_studentship_statuses_path %> + <%= render 'card', content: UnitInstructionLanguage.count, title: '.unit_instruction_languages', path: unit_instruction_languages_path %> + <%= render 'card', content: UnitInstructionType.count, title: '.unit_instruction_types', path: unit_instruction_types_path %> + <%= render 'card', content: UnitStatus.count, title: '.unit_statuses', path: unit_statuses_path %> + <%= render 'card', content: UnitType.count, title: '.unit_types', path: unit_types_path %> + <%= render 'card', content: UniversityType.count, title: '.university_types', path: university_types_path %> + <%= render 'card', content: Language.count, title: '.languages', path: languages_path %> +
\ No newline at end of file diff --git a/app/views/references/languages/index.html.erb b/app/views/references/languages/index.html.erb index ef4717065..caf6e52be 100644 --- a/app/views/references/languages/index.html.erb +++ b/app/views/references/languages/index.html.erb @@ -9,13 +9,9 @@ <%= fa_icon 'language', text: t('.card_header') %>
- <%= form_tag languages_path, method: :get do %> -
- <%= text_field_tag 'term', params[:term], placeholder: t('.name'), class: 'form-control' %> -
- <%= submit_tag t('search'), class: 'btn btn-primary' %> - <% end %> -
+ <%= render 'components/smart_search_form', + path: languages_path, + placeholder: t('.name') %>
diff --git a/app/views/student_management/prospective_students/_search.html.erb b/app/views/student_management/prospective_students/_search.html.erb index a40c8ccef..4cc266d1d 100644 --- a/app/views/student_management/prospective_students/_search.html.erb +++ b/app/views/student_management/prospective_students/_search.html.erb @@ -1,75 +1,84 @@ -
-
- -
-
- <%= form_tag prospective_students_path, method: :get do %> -
- <%= text_field_tag 'term', params[:term], placeholder: t('.smart_search_placeholder'), class: 'form-control' %> -
- <%= submit_tag t('search'), class: 'btn btn-primary' %> - <% end %> -
-
-
+ +
-
+ @@ -29,6 +30,7 @@ + diff --git a/app/views/student_management/prospective_students/show.html.erb b/app/views/student_management/prospective_students/show.html.erb index fa59cf473..c018f96d8 100644 --- a/app/views/student_management/prospective_students/show.html.erb +++ b/app/views/student_management/prospective_students/show.html.erb @@ -1,4 +1,78 @@
+
+
+
+ <%= fa_icon 'university' %><%= t('.prospective_student') %> +
+
+
<%= t('.meb_status') %> <%= t('.military_status') %> <%= t('.obs_status') %><%= t('.student_entrance_type') %> <%= t('actions') %>
<%= prospective_student.meb_status ? t('.graduated') : t('.not_graduated_or_unknown') %> <%= prospective_student.military_status ? t('.unproblematic') : t('.must_see_recruiting_office') %> <%= prospective_student.obs_status ? t('.unproblematic') : t('.student_in_a_different_unit') %><%= prospective_student.student_entrance_type.name %> <%= link_to_show(prospective_student_path(prospective_student)) %>
+ + + + + + + + <% unit = @prospective_student.unit %> + + + + + + + + + + + + + + + + + + + + + + + + + + + <% @prospective_student.unit.registration_documents.each do |registration_document| %> + + + + + + <% end %> + +
<%= t('.student_entrance_type') %><%= @prospective_student.student_entrance_type.name %>
<%= t('.unit') %><%= unit.name %> / <%= unit.parent.name %> / <%= unit.parent.try(:parent).try(:name) %>
<%= t('.meb_status') %><%= @prospective_student.meb_status ? t('.graduated') : t('.not_graduated_or_unknown') %>
<%= t('.last_update') %>: <%= as_date_and_time(@prospective_student.meb_status_date) %>
<%= t('.military_status') %><%= @prospective_student.military_status ? t('.unproblematic') : t('.must_see_recruiting_office') %>
<%= t('.last_update') %>: <%= as_date_and_time(@prospective_student.military_status_date) %>
<%= t('.obs_status') %><%= @prospective_student.obs_status ? t('.unproblematic') : t('.student_in_a_different_unit') %>
+ <%= t('.last_update') %>: <%= as_date_and_time(@prospective_student.obs_status_date) %> + <% if @prospective_student.obs_registered_program %> +
+

<%= t('.registered_to', program: @prospective_student.obs_registered_program) %>

+ <% end %> +
<%= registration_document.document.name %><%= check_box("post", "validated") %>
+
+
+ <% if @prospective_student.can_permanently_register? %> + <%= link_to register_prospective_student_path, class: "btn btn-block btn-success" do %> + <%= t('.permanently_register') %> + <% end %> + <% elsif @prospective_student.can_temporarily_register? %> + <%= link_to register_prospective_student_path, class: "btn btn-block btn-warning" do %> + <%= t('.temporarily_register') %> + <% end %> + <% else %> + <%= link_to register_prospective_student_path, class: "btn btn-block btn-danger disabled" do %> + <%= t('.can_not_register') %> + <% end %> + <% end %> +
+ +
@@ -51,57 +125,10 @@ <%= t('.registration_district') %> <%= @prospective_student.registration_district %> - - -
-
-
-
-
-
- <%= fa_icon 'university' %><%= t('.prospective_student') %> -
-
- - - - - <% unit = @prospective_student.unit %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
<%= t('.unit') %><%= unit.name %> / <%= unit.parent.name %> / <%= unit.parent.try(:parent).name %>
<%= t('.state_of_education') %> <%= @prospective_student.state_of_education %>
<%= t('.meb_status') %> - <%= @prospective_student.meb_status ? t('.graduated') : t('.not_graduated_or_unknown') %>
<%= t('.meb_status_date') %><%= @prospective_student.meb_status_date %>
<%= t('.military_status') %><%= @prospective_student.military_status ? t('.unproblematic') : t('.must_see_recruiting_office') %>
<%= t('.military_status_date') %><%= @prospective_student.military_status_date %>
<%= t('.obs_status') %><%= @prospective_student.obs_status ? t('.unproblematic') : t('.student_in_a_different_unit') %>
<%= t('.obs_status_date') %><%= @prospective_student.obs_status_date %>
<%= t('.obs_registered_program') %><%= @prospective_student.obs_registered_program %>
diff --git a/app/views/units/_search.html.erb b/app/views/units/_search.html.erb index 5b3f2a144..29cabd55c 100644 --- a/app/views/units/_search.html.erb +++ b/app/views/units/_search.html.erb @@ -1,57 +1,71 @@ -
+
- -
- -
+
<%= form_tag units_path, method: :get do %>
+
+
+ <%= label_tag :term, t('smart_search') %> + <%= text_field_tag :term, + params[:term], + placeholder: t('.smart_search_placeholder'), + class: 'form-control' %> +
+
- - <%= text_field_tag 'duration', params[:duration], placeholder: "Öğretim Süresi (Yıl)", class: 'form-control' %> + <%= label_tag :duration, t('.duration') %> + <%= text_field_tag :duration, + params[:duration], + placeholder: "Öğretim Süresi (Yıl)", + class: 'form-control' %>
- - <%= select_tag(:unit_status_id, options_from_collection_for_select(UnitStatus.all, :id, :name), include_blank: true, class: 'form-control') %> + <%= label_tag :unit_status_id, t('.unit_status') %> + <%= select_tag(:unit_status_id, + options_from_collection_for_select(UnitStatus.all, :id, :name, params[:unit_status_id]), + include_blank: true, + class: 'form-control') %>
- - <%= select_tag(:unit_instruction_language_id, options_from_collection_for_select(UnitInstructionLanguage.all, :id, :name), include_blank: true, class: 'form-control') %> + <%= label_tag :unit_instruction_language_id, t('.unit_instruction_language') %> + <%= select_tag(:unit_instruction_language_id, + options_from_collection_for_select(UnitInstructionLanguage.all, :id, :name, params[:unit_instruction_language_id]), + include_blank: true, + class: 'form-control') %>
- - <%= select_tag(:unit_instruction_type_id, options_from_collection_for_select(UnitInstructionType.all, :id, :name), include_blank: true, class: 'form-control') %> + <%= label_tag :unit_instruction_type_id, t('.unit_instruction_type') %> + <%= select_tag(:unit_instruction_type_id, + options_from_collection_for_select(UnitInstructionType.all, :id, :name, params[:unit_instruction_type_id]), + include_blank: true, + class: 'form-control') %>
@@ -64,4 +78,10 @@
-
\ No newline at end of file +
+ + diff --git a/app/views/users/_identities.html.erb b/app/views/users/_identities.html.erb index 950b2a197..d4916f629 100644 --- a/app/views/users/_identities.html.erb +++ b/app/views/users/_identities.html.erb @@ -19,7 +19,7 @@
- +
<%= t('activerecord.attributes.identity.name') %><%= t('activerecord.attributes.identity.type') %> <%= fa_icon('gavel', text: t('activerecord.enums.identity.types.formal')) if identity.formal? %> diff --git a/app/views/users/_search.html.erb b/app/views/users/_search.html.erb deleted file mode 100644 index f0b909f1a..000000000 --- a/app/views/users/_search.html.erb +++ /dev/null @@ -1,21 +0,0 @@ -
-
- -
-
- <%= form_tag users_path, method: :get do %> -
- <%= text_field_tag 'term', params[:term], placeholder: t('.smart_search_placeholder'), class: 'form-control' %> -
- <%= submit_tag t('search'), class: 'btn btn-primary' %> - <% end %> -
-
-
-
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index 0d0baeffa..4bc7426c0 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -9,7 +9,9 @@ <%= fa_icon 'align-justify', text: t('.card_header') %>
- <%= render 'search' %> + <%= render 'components/smart_search_form', + path: users_path, + placeholder: t('.smart_search_placeholder') %> diff --git a/config/application.rb b/config/application.rb index 7b87213ec..3343f18ea 100644 --- a/config/application.rb +++ b/config/application.rb @@ -25,6 +25,7 @@ class Application < Rails::Application I18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.yml').to_s] Dir[ + Rails.root.join('app', 'services', '**', '*.rb'), Rails.root.join('lib', 'support', '**', '*.rb'), Rails.root.join('lib', 'api', '**', '*.rb') ].each { |file| require file } diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb index 83718ead9..108a7c387 100644 --- a/config/initializers/simple_form.rb +++ b/config/initializers/simple_form.rb @@ -130,7 +130,7 @@ # in this configuration, which is recommended due to some quirks from different browsers. # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations, # change this configuration to true. - config.browser_validations = false + config.browser_validations = true # Collection of methods to detect if a file type was given. # config.file_methods = [ :mounted_as, :file?, :public_filename, :attached? ] diff --git a/config/locales/defaults/en.yml b/config/locales/defaults/en.yml index 70e9dbad0..2eb50a5b2 100644 --- a/config/locales/defaults/en.yml +++ b/config/locales/defaults/en.yml @@ -1,22 +1,22 @@ en: - actions: Actions action_group: add: Add back: Back destroy: Destroy edit: Edit + file: Show File new: New show: Show update: Update - file: Show File + actions: Actions are_you_sure: Are you sure? - save: Save - search: Search - home_nav: Home created_at: Created At - updated_at: Updated At - 'yes': 'Yes' - 'no': 'No' detailed_search: Detailed Search + home_nav: Home + 'no': 'No' reset: Reset + save: Save + search: Search smart_search: Smart Search + updated_at: Updated At + 'yes': 'Yes' diff --git a/config/locales/defaults/rails/en.yml b/config/locales/defaults/rails/en.yml index 22aefe302..d63d2dc90 100644 --- a/config/locales/defaults/rails/en.yml +++ b/config/locales/defaults/rails/en.yml @@ -4,8 +4,8 @@ en: messages: record_invalid: "Validation failed: %{errors}" restrict_dependent_destroy: - has_one: "Cannot delete record because a dependent %{record} exists" has_many: "Cannot delete record because dependent %{record} exist" + has_one: "Cannot delete record because a dependent %{record} exists" date: abbr_day_names: - Sun @@ -92,12 +92,12 @@ en: x_months: one: 1 month other: "%{count} months" - x_years: - one: 1 year - other: "%{count} years" x_seconds: one: 1 second other: "%{count} seconds" + x_years: + one: 1 year + other: "%{count} years" prompts: day: Day hour: Hour @@ -110,7 +110,6 @@ en: messages: accepted: must be accepted blank: can't be blank - present: must be blank confirmation: doesn't match %{attribute} empty: can't be empty equal_to: must be equal to %{count} @@ -126,6 +125,8 @@ en: not_a_number: is not a number not_an_integer: must be an integer odd: must be odd + other_than: must be other than %{count} + present: must be blank required: must exist taken: has already been taken too_long: @@ -137,7 +138,6 @@ en: wrong_length: one: is the wrong length (should be 1 character) other: is the wrong length (should be %{count} characters) - other_than: must be other than %{count} template: body: 'There were problems with the following fields:' header: @@ -150,6 +150,7 @@ en: create: Create %{model} submit: Save %{model} update: Update %{model} + not_found: 'Not found!' number: currency: format: @@ -210,4 +211,3 @@ en: long: "%B %d, %Y %I:%M %p" short: "%d %b %I:%M %p" pm: pm - not_found: 'Not found!' diff --git a/config/locales/defaults/rails/tr.yml b/config/locales/defaults/rails/tr.yml index fbc65c79d..2e182b1d6 100644 --- a/config/locales/defaults/rails/tr.yml +++ b/config/locales/defaults/rails/tr.yml @@ -1,15 +1,15 @@ tr: activerecord: + attributes: + user: + id_number: 'Kimlik numarası' + password: 'Parola' errors: messages: record_invalid: 'Doğrulama başarısız oldu: %{errors}' restrict_dependent_destroy: - has_one: Bağlı bir kayıt %{record} bulunduğu için kayıt silinemedi has_many: Bağlı kayıtlar %{record} bulunduğu için kayıt silinemedi - attributes: - user: - password: 'Parola' - id_number: 'Kimlik numarası' + has_one: Bağlı bir kayıt %{record} bulunduğu için kayıt silinemedi date: abbr_day_names: - Pzr @@ -114,7 +114,6 @@ tr: messages: accepted: kabul edilmeli blank: doldurulmalı - present: boş bırakılmalı confirmation: "%{attribute} teyidiyle uyuşmuyor" empty: doldurulmalı equal_to: tam olarak %{count} olmalı @@ -126,9 +125,13 @@ tr: invalid: geçersiz less_than: "%{count} sayısından küçük olmalı" less_than_or_equal_to: "%{count} sayısına eşit veya küçük olmalı" + model_invalid: "Doğrulama başarısız oldu: %{errors}" not_a_number: geçerli bir sayı değil not_an_integer: tam sayı olmalı odd: tek olmalı + other_than: "%{count} karakterden oluşamaz" + present: boş bırakılmalı + required: doldurulmalı taken: hali hazırda kullanılmakta too_long: one: çok uzun (en fazla 1 karakter) @@ -139,9 +142,6 @@ tr: wrong_length: one: hatalı uzunlukta (1 karakter olmalı) other: hatalı uzunlukta (%{count} karakter olmalı) - other_than: "%{count} karakterden oluşamaz" - model_invalid: "Doğrulama başarısız oldu: %{errors}" - required: doldurulmalı template: body: 'Lütfen aşağıdaki hataları düzeltiniz:' header: @@ -154,6 +154,7 @@ tr: create: "%{model} Ekle" submit: "%{model} Kaydet" update: "%{model} Güncelle" + not_found: 'Erişmeye çalıştığınız sayfa bulunamadı!' number: currency: format: @@ -214,4 +215,3 @@ tr: long: "%e %B %Y, %A, %H:%M" short: "%e %B, %H:%M" pm: öğleden sonra - not_found: 'Erişmeye çalıştığınız sayfa bulunamadı!' diff --git a/config/locales/defaults/tr.yml b/config/locales/defaults/tr.yml index 3ce049b4c..f68a66def 100644 --- a/config/locales/defaults/tr.yml +++ b/config/locales/defaults/tr.yml @@ -1,22 +1,22 @@ tr: - actions: İşlemler action_group: add: Ekle back: Geri destroy: Sil edit: Düzenle + file: Dosya Görüntüle new: Yeni show: Görüntüle update: Güncelle - file: Dosya Görüntüle + actions: İşlemler are_you_sure: Emin misiniz? - save: Kaydet - search: Arama Yap - home_nav: Anasayfa created_at: Oluşturulma Tarihi - updated_at: Güncellenme Tarihi - 'yes': Evet - 'no': Hayır detailed_search: Detaylı Arama + home_nav: Anasayfa + 'no': Hayır reset: Reset + save: Kaydet + search: Arama Yap smart_search: Akıllı Arama + updated_at: Güncellenme Tarihi + 'yes': Evet diff --git a/config/locales/gems/devise/en.yml b/config/locales/gems/devise/en.yml index 2ae9baadc..f41f38e92 100644 --- a/config/locales/gems/devise/en.yml +++ b/config/locales/gems/devise/en.yml @@ -1,25 +1,5 @@ en: devise: - mailer: - common: - hello: 'Hello, %{mail}!' - email_changed: - subject: Email Changed - body: You have successfully updated your registered e-mail address. You can drop us a line explaining the case at <%= Rails.application.config.tenant.email.support %>, if you think there is a mistake. - new_mail: 'Your new e-mail: %{mail}' - password_change: - subject: Password Changed - body: You have successfully updated your password. You can drop us a line explaining the case at <%= Rails.application.config.tenant.email.support %>, if you think there is a mistake. - reset_password_instructions: - subject: Reset password instructions - body: You or someone else made a request to reset your password. Click the link below to reset your password. - reset_password: Reset Password - didnt_requested: You can ignore this e-mail if you didn't requested a password change. Your password will not change unless you click the link shown above and then set a new password. - confirmation_instructions: - subject: Confirmation instructions - unlock_instructions: - subject: Unlock instructions - confirmations: confirmed: "Your email address has been successfully confirmed." send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." @@ -28,12 +8,31 @@ en: already_authenticated: "You are already signed in." inactive: "Your account is not activated yet." invalid: "Invalid %{authentication_keys} or password." - locked: "Your account is locked." last_attempt: "You have one more attempt before your account is locked." + locked: "Your account is locked." not_found_in_database: "Invalid %{authentication_keys} or password." timeout: "Your session expired. Please sign in again to continue." unauthenticated: "You need to sign in or sign up before continuing." unconfirmed: "You have to confirm your email address before continuing." + mailer: + common: + hello: 'Hello, %{mail}!' + confirmation_instructions: + subject: Confirmation instructions + email_changed: + body: You have successfully updated your registered e-mail address. You can drop us a line explaining the case at <%= Rails.application.config.tenant.email.support %>, if you think there is a mistake. + new_mail: 'Your new e-mail: %{mail}' + subject: Email Changed + password_change: + body: You have successfully updated your password. You can drop us a line explaining the case at <%= Rails.application.config.tenant.email.support %>, if you think there is a mistake. + subject: Password Changed + reset_password_instructions: + body: You or someone else made a request to reset your password. Click the link below to reset your password. + didnt_requested: You can ignore this e-mail if you didn't requested a password change. Your password will not change unless you click the link shown above and then set a new password. + reset_password: Reset Password + subject: Reset password instructions + unlock_instructions: + subject: Unlock instructions omniauth_callbacks: failure: "Could not authenticate you from %{kind} because \"%{reason}\"." success: "Successfully authenticated from %{kind} account." @@ -52,9 +51,9 @@ en: update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address." updated: "Your account has been updated successfully." sessions: + already_signed_out: "Signed out successfully." signed_in: "Signed in successfully." signed_out: "Signed out successfully." - already_signed_out: "Signed out successfully." unlocks: send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." diff --git a/config/locales/gems/devise/tr.yml b/config/locales/gems/devise/tr.yml index bd91ca337..9d48fdd58 100644 --- a/config/locales/gems/devise/tr.yml +++ b/config/locales/gems/devise/tr.yml @@ -1,25 +1,5 @@ tr: devise: - mailer: - common: - hello: 'Merhaba, %{mail}!' - email_changed: - subject: Email Adresiniz Değişti - body: Kayıtlı e-mail adresiniz başarıyla değiştirilmiştir. Bir yanlışlık olduğunu düşünüyorsanız <%= Rails.application.config.tenant.email.support %> adresine durumu anlatan bir e-mail gönderebilirsiniz. - new_mail: 'Yeni e-mail adresiniz: %{mail}' - password_change: - subject: Şifreniz Değişti - body: Şifreniz başarıyla değiştirilmiştir. Bir yanlışlık olduğunu düşünüyorsanız <%= Rails.application.config.tenant.email.support %> adresine durumu anlatan bir e-mail gönderebilirsiniz. - reset_password_instructions: - subject: Parola sıfırlama talimatları - body: Siz veya başka birisi şifrenizi sıfırlama talebinde bulundu. Şifrenizi sıfırlamak istiyorsanız aşağıdaki linke tıklayabilirsiniz. - reset_password: Şifremi Sıfırla - didnt_requested: Eğer böyle bir istekte bulunmadıysanız bu e-mail'i görmezden gelebilirsiniz. Yukarıdaki linke tıklayarak yeni bir şifre belirledikçe şifreniz değişmeyecektir. - confirmation_instructions: - subject: Onaylama talimatları - unlock_instructions: - subject: Kilit kaldırma talimalatları - confirmations: confirmed: "Eposta adresiniz başırılı bir şekilde onaylandı." send_instructions: "Bir kaç dakika içerisinde eposta adresinizi nasıl onaylayacağınız hakkında bir eposta alacaksınız." @@ -28,12 +8,31 @@ tr: already_authenticated: "Zaten giriş yaptınız." inactive: "Hesabınız henüz aktif edilmedi." invalid: "Geçersiz %{authentication_keys} veya parola." - locked: "Hesabınız kilitli." last_attempt: "Hesabınız kilitlenmeden önceki son şansınız." + locked: "Hesabınız kilitli." not_found_in_database: "Geçersiz %{authentication_keys} veya parola." timeout: "Oturum süreniz sonlandı. Lütfen devam etmek için tekrar giriş yapın." unauthenticated: "Devam etmeden önce giriş yapmalı veya kayıt olmalısınız." unconfirmed: "Devam etmeden önce eposta adresinizi onaylamalısınız." + mailer: + common: + hello: 'Merhaba, %{mail}!' + confirmation_instructions: + subject: Onaylama talimatları + email_changed: + body: Kayıtlı e-mail adresiniz başarıyla değiştirilmiştir. Bir yanlışlık olduğunu düşünüyorsanız <%= Rails.application.config.tenant.email.support %> adresine durumu anlatan bir e-mail gönderebilirsiniz. + new_mail: 'Yeni e-mail adresiniz: %{mail}' + subject: Email Adresiniz Değişti + password_change: + body: Şifreniz başarıyla değiştirilmiştir. Bir yanlışlık olduğunu düşünüyorsanız <%= Rails.application.config.tenant.email.support %> adresine durumu anlatan bir e-mail gönderebilirsiniz. + subject: Şifreniz Değişti + reset_password_instructions: + body: Siz veya başka birisi şifrenizi sıfırlama talebinde bulundu. Şifrenizi sıfırlamak istiyorsanız aşağıdaki linke tıklayabilirsiniz. + didnt_requested: Eğer böyle bir istekte bulunmadıysanız bu e-mail'i görmezden gelebilirsiniz. Yukarıdaki linke tıklayarak yeni bir şifre belirledikçe şifreniz değişmeyecektir. + reset_password: Şifremi Sıfırla + subject: Parola sıfırlama talimatları + unlock_instructions: + subject: Kilit kaldırma talimalatları omniauth_callbacks: failure: "\"%{reason}\" olduğu için %{kind}'den doğrulama yapılamıyor." success: "%{kind} hesabından başarılı bir şekilde doğrulandı." @@ -52,9 +51,9 @@ tr: update_needs_confirmation: "Hesabınız başarılı bir şekilde güncellendi. Fakar eposta adresinizi onaylamanız gerekmekteir. Lütfen eposta kutunuzu kontrol ediniz ve yeni eposta adresinizi onaylama linkine tıklayınız." updated: "Hesabınız başarılı bir şekilde güncellendi." sessions: + already_signed_out: "Başarılı çıkış." signed_in: "Başarılı giriş." signed_out: "Başarılı çıkış." - already_signed_out: "Başarılı çıkış." unlocks: send_instructions: "Birkaç dakika içerisinde hesabınızın kilidini nasıl kaldıracağınız hakkında bir eposta alacaksınız." send_paranoid_instructions: "Eğer hesabınız varsa birkaç dakika içerisinde hesabınızın kilidini nasıl kaldırıcağınız hakkında bir eposta alacaksınız." diff --git a/config/locales/gems/pagy/en.yml b/config/locales/gems/pagy/en.yml index 96da8848c..c7b387a1a 100644 --- a/config/locales/gems/pagy/en.yml +++ b/config/locales/gems/pagy/en.yml @@ -1,22 +1,23 @@ +--- en: pagy: - nav: - prev: "‹ Prev" - next: "Next ›" - gap: "…" + compact: + of: of + page: Page info: - single_page: - zero: "No %{item_name} found" - one: "Displaying 1 %{item_name}" - other: "Displaying all %{count} %{item_name}" - multiple_pages: "Displaying %{item_name} %{from}-%{to} of %{count} in total" item_name: - zero: "items" - one: "item" - other: "items" - compact: - page: "Page" - of: "of" + one: item + other: items + zero: items + multiple_pages: Displaying %{item_name} %{from}-%{to} of %{count} in total + single_page: + one: Displaying 1 %{item_name} + other: Displaying all %{count} %{item_name} + zero: No %{item_name} found items: - show: "Show" - items: "items per page" \ No newline at end of file + items: items per page + show: Show + nav: + gap: "…" + next: Next › + prev: "‹ Prev" diff --git a/config/locales/gems/pagy/tr.yml b/config/locales/gems/pagy/tr.yml index 6fdaa0549..9967a1f54 100644 --- a/config/locales/gems/pagy/tr.yml +++ b/config/locales/gems/pagy/tr.yml @@ -1,22 +1,23 @@ +--- tr: pagy: - nav: - prev: "‹ Önceki" - next: "Sonraki ›" - gap: "…" + compact: + of: "/" + page: Sayfa info: + item_name: + one: kayıt + other: kayıt + zero: kayıt + multiple_pages: "%{count} %{item_name} içerisinden %{from}-%{to} kadarı gösteriliyor." single_page: - zero: "Hiç %{item_name} bulunamadı." one: "1 %{item_name} gösteriliyor." - other: "Toplam %{count} %{item_name} gösteriliyor." - multiple_pages: "%{count} %{item_name} içerisinden %{from}-%{to} kadarı gösteriliyor." - item_name: - zero: "kayıt" - one: "kayıt" - other: "kayıt" - compact: - page: "Sayfa" - of: "/" + other: Toplam %{count} %{item_name} gösteriliyor. + zero: Hiç %{item_name} bulunamadı. items: - show: "Göster" - items: "sayfa başı" + items: sayfa başı + show: Göster + nav: + gap: "…" + next: Sonraki › + prev: "‹ Önceki" diff --git a/config/locales/gems/simple_form/en.yml b/config/locales/gems/simple_form/en.yml index bc4f237cb..e1111148e 100644 --- a/config/locales/gems/simple_form/en.yml +++ b/config/locales/gems/simple_form/en.yml @@ -1,12 +1,10 @@ +--- en: simple_form: - "yes": 'Yes' - "no": 'No' - required: - text: 'required' - mark: '*' - # You can uncomment the line below if you need to overwrite the whole required html. - # When using html, text and mark won't be used. - # html: '*' error_notification: - default_message: "Please review the problems below:" + default_message: 'Please review the problems below:' + 'no': 'No' + required: + mark: "*" + text: required + 'yes': 'Yes' diff --git a/config/locales/gems/simple_form/tr.yml b/config/locales/gems/simple_form/tr.yml index f58271854..6a57e5360 100644 --- a/config/locales/gems/simple_form/tr.yml +++ b/config/locales/gems/simple_form/tr.yml @@ -1,12 +1,10 @@ +--- tr: simple_form: - "yes": 'Evet' - "no": 'Hayır' - required: - text: 'zorunlu alan' - mark: '*' - # You can uncomment the line below if you need to overwrite the whole required html. - # When using html, text and mark won't be used. - # html: '*' error_notification: - default_message: "Lütfen aşağıdaki sorunları gözden geçirin:" + default_message: 'Lütfen aşağıdaki sorunları gözden geçirin:' + 'no': Hayır + required: + mark: "*" + text: zorunlu alan + 'yes': Evet diff --git a/config/locales/layouts/application/en.yml b/config/locales/layouts/application/en.yml index f67729624..d54b924c0 100644 --- a/config/locales/layouts/application/en.yml +++ b/config/locales/layouts/application/en.yml @@ -1,24 +1,24 @@ en: - layouts: - application: - my_account: My Account - identities: Identities - addresses: Addresses - profile_settings: Profile Settings - settings: Settings - account_settings: Account Settings - logout: Logout home: components: membership_notifications: - upcoming_events: Upcoming academic calendar events - profile_completion_rate: Profile completion rate address_information: You address information + change_password: Change your password. identity_information: Your identity information - seems_missing: seems missing. last_password_change: Last password change - change_password: Change your password. + profile_completion_rate: Profile completion rate + seems_missing: seems missing. + upcoming_events: Upcoming academic calendar events user_and_account_statistics: - registered_users: Registered Users - identities: Identities addresses: Addresses + identities: Identities + registered_users: Registered Users + layouts: + application: + account_settings: Account Settings + addresses: Addresses + identities: Identities + logout: Logout + my_account: My Account + profile_settings: Profile Settings + settings: Settings diff --git a/config/locales/layouts/application/tr.yml b/config/locales/layouts/application/tr.yml index d78522e7c..8009276f3 100644 --- a/config/locales/layouts/application/tr.yml +++ b/config/locales/layouts/application/tr.yml @@ -1,24 +1,24 @@ tr: - layouts: - application: - my_account: Hesabım - identities: Kimlik Bilgileri - addresses: Adres Bilgileri - profile_settings: Profil Ayarları - settings: Ayarlar - account_settings: Hesap Ayarları - logout: Çıkış Yap home: components: membership_notifications: - upcoming_events: Yaklaşan akademik takvim olayları - profile_completion_rate: Profil tamamlama oranı address_information: Adres bilgileriniz + change_password: Şifrenizi değiştirin. identity_information: Kimlik bilgileriniz - seems_missing: eksik görünüyor. last_password_change: Son şifre değişikliği - change_password: Şifrenizi değiştirin. + profile_completion_rate: Profil tamamlama oranı + seems_missing: eksik görünüyor. + upcoming_events: Yaklaşan akademik takvim olayları user_and_account_statistics: - registered_users: Kayıtlı Kullanıcılar - identities: Kimlik Bilgileri addresses: Adres Bilgileri + identities: Kimlik Bilgileri + registered_users: Kayıtlı Kullanıcılar + layouts: + application: + account_settings: Hesap Ayarları + addresses: Adres Bilgileri + identities: Kimlik Bilgileri + logout: Çıkış Yap + my_account: Hesabım + profile_settings: Profil Ayarları + settings: Ayarlar diff --git a/config/locales/layouts/mailer/tr.yml b/config/locales/layouts/mailer/tr.yml index dcb53182f..8980919d5 100644 --- a/config/locales/layouts/mailer/tr.yml +++ b/config/locales/layouts/mailer/tr.yml @@ -1,4 +1,4 @@ tr: layouts: mailer: - title: Nokul - Üniversite Otomasyonu \ No newline at end of file + title: Nokul - Üniversite Otomasyonu diff --git a/config/locales/layouts/shared/meta_en.yml b/config/locales/layouts/shared/meta_en.yml index 5ca54ffe8..8344be1cb 100644 --- a/config/locales/layouts/shared/meta_en.yml +++ b/config/locales/layouts/shared/meta_en.yml @@ -2,6 +2,6 @@ en: layouts: shared: meta: - title: Nokul - University Otomation - description: Nokul, is a complete web application and automation for universities and students. author: OMU - BAUM + description: Nokul, is a complete web application and automation for universities and students. + title: Nokul - University Otomation diff --git a/config/locales/layouts/shared/meta_tr.yml b/config/locales/layouts/shared/meta_tr.yml index 5bd0aafd8..dacb8c0a5 100644 --- a/config/locales/layouts/shared/meta_tr.yml +++ b/config/locales/layouts/shared/meta_tr.yml @@ -2,6 +2,6 @@ tr: layouts: shared: meta: - title: Nokul - Üniversite Otomasyonu - description: Nokul, nitelikli okul üniversiteler için öğrenci ve personel otomasyonudur. author: OMÜ - BAUM + description: Nokul, nitelikli okul üniversiteler için öğrenci ve personel otomasyonudur. + title: Nokul - Üniversite Otomasyonu diff --git a/config/locales/layouts/shared/sidebar_en.yml b/config/locales/layouts/shared/sidebar_en.yml index bb3a232b7..046852249 100644 --- a/config/locales/layouts/shared/sidebar_en.yml +++ b/config/locales/layouts/shared/sidebar_en.yml @@ -2,23 +2,26 @@ en: layouts: shared: sidebar: - units: Units - locations: Locations - calendars: Calendars + academic_calendars: Academic Calendars + academic_terms: Academic Terms + agenda_types: Agenda Types calendar_titles: Calendar Titles calendar_types: Calendar Types - academic_terms: Academic Terms - academic_calendars: Academic Calendars - courses: Courses + calendars: Calendars + committee_units: Committee Units + committees: Committees + course_group_types: Course Group Type course_management: Course Management course_unit_groups: Course Unit Group - course_group_types: Course Group Type + courses: Courses curriculums: Curriculums + definitions: Definitions + documents: Required Documents + first_registration: Prospective Students + high_school_types: High School Types languages: Languages - users: Users + locations: Locations references: References - documents: Documents - high_school_types: High School Types student_disability_types: Disability Types student_drop_out_types: Drop Out Types student_education_levels: Education Levels @@ -26,16 +29,14 @@ en: student_entrance_types: Entrance Types student_grades: Grades student_grading_systems: Grading Systems - student_punishment_types: Punishment Types student_management: Student Management + student_punishment_types: Punishment Types student_studentship_statuses: Studentship Statuses + studies: Academic Studies unit_instruction_languages: Instruction Languages unit_instruction_types: Instruction Types unit_statuses: Unit Statuses unit_types: Unit Types + units: Units university_types: University Types - studies: Academic Studies - committees: Committees - committee_units: Committee Units - agenda_types: Agenda Types - first_registration: Prospective Students + users: Users diff --git a/config/locales/layouts/shared/sidebar_tr.yml b/config/locales/layouts/shared/sidebar_tr.yml index e01ed92cf..28418fbba 100644 --- a/config/locales/layouts/shared/sidebar_tr.yml +++ b/config/locales/layouts/shared/sidebar_tr.yml @@ -2,23 +2,26 @@ tr: layouts: shared: sidebar: - units: Birimler - locations: Konumlar - calendars: Takvimler + academic_calendars: Akademik Takvimler + academic_terms: Akademik Dönemler + agenda_types: Gündem Türleri calendar_titles: Takvim Başlıkları calendar_types: Takvim Türleri - academic_terms: Akademik Dönemler - academic_calendars: Akademik Takvimler - courses: Dersler + calendars: Takvimler + committee_units: Kurul/Komisyon Birimleri + committees: Kurullar/Komisyonlar + course_group_types: Ders Grup Türleri course_management: Ders İşlemler course_unit_groups: Ders Grupları - course_group_types: Ders Grup Türleri + courses: Dersler curriculums: Müfredatlar + definitions: Tanımlar + documents: Gerekli Belgeler + first_registration: İlk Kayıt + high_school_types: Lise Türleri languages: Diller - users: Kullanıcılar + locations: Konumlar references: Referanslar - documents: Belgeler - high_school_types: Lise Türleri student_disability_types: Engel Türleri student_drop_out_types: Ayrılma Nedenleri student_education_levels: Eğitim Düzeyleri @@ -26,16 +29,14 @@ tr: student_entrance_types: Giriş Türleri student_grades: Sınıflar student_grading_systems: Not Sistemleri - student_punishment_types: Ceza Türleri student_management: Öğrenci Yönetimi + student_punishment_types: Ceza Türleri student_studentship_statuses: Öğrencilik Hakları + studies: Akademik Çalışmalar unit_instruction_languages: Öğrenim Dilleri unit_instruction_types: Öğrenim Türleri unit_statuses: Aktiflik Durumları unit_types: Birim Türleri + units: Birimler university_types: Üniversite Türleri - studies: Akademik Çalışmalar - committees: Kurullar/Komisyonlar - committee_units: Kurul/Komisyon Birimleri - agenda_types: Gündem Türleri - first_registration: İlk Kayıt + users: Kullanıcılar diff --git a/config/locales/models/account/en.yml b/config/locales/models/account/en.yml index 496fecba3..5274524b5 100644 --- a/config/locales/models/account/en.yml +++ b/config/locales/models/account/en.yml @@ -1,88 +1,89 @@ +--- en: - activerecord: - attributes: - employee: &employee_attributes - is_active: Is Active? - title_id: Title - user_id: User - id_number: ID Number - duty: &duty_attributes - tenure_status: Tenure Status - tenure: Tenure - temporary: Temporary Duty - start_date: Start Date - end_date: End Date - employee: Employee - unit_id: Unit - position: &position_attributes - administrative_function_id: Administrative Function - start_date: Start Date - end_date: End Date - helpers: - submit: - employee: - create: Create Employee - update: Update Employee - duty: - create: Create Duty - update: Update Duty - position: - create: Create Position - update: Update Position account: - employees: - new: - form_title: Create a Employee - edit: - form_title: Update the Employee - create: - success: Employee successfully created. - destroy: - success: Employee successfully deleted. - warning: Employee could not be deleted. - update: - success: Employee successfully updated. duties: - new: - form_title: Create a Duty - edit: - form_title: Update the Duty create: success: Duty successfully created. destroy: success: Duty successfully deleted. warning: Duty could not be deleted. + edit: + form_title: Update the Duty + new: + form_title: Create a Duty update: success: Duty successfully updated. - positions: - new: - form_title: Create a Position + employees: + create: + success: Employee successfully created. + destroy: + success: Employee successfully deleted. + warning: Employee could not be deleted. edit: - form_title: Update the Position + form_title: Update the Employee + new: + form_title: Create a Employee + update: + success: Employee successfully updated. + positions: create: success: Position successfully created. destroy: success: Position successfully deleted. warning: Position could not be deleted. + edit: + form_title: Update the Position + new: + form_title: Create a Position update: success: Position successfully updated. profile: edit: - profile_settings: Profile Settings - visiblity_settings: Visiblity Settings - phone_number: Phone Number extension_number: Extension Number - website: Website - twitter: Twitter Username linkedin: Linkedin Username - skype: Skype Username orcid: ORCID + phone_number: Phone Number + profile_settings: Profile Settings public_photo: Show picture on my profile public_studies: Show academic studies on my profile + skype: Skype Username + twitter: Twitter Username + visiblity_settings: Visiblity Settings + website: Website update: success: Profile successfully updated. + activerecord: + attributes: + duty: + employee_id: Employee + end_date: End Date + start_date: Start Date + temporary: Temporary Duty + tenure: Tenure + tenure_status: Tenure Status + unit_id: Unit + employee: + id_number: ID Number + is_active: Is Active? + title_id: Title + user_id: User + position: + administrative_function_id: Administrative Function + end_date: End Date + start_date: Start Date + helpers: + submit: + duty: + create: Create Duty + update: Update Duty + employee: + create: Create Employee + update: Update Employee + position: + create: Create Position + update: Update Position simple_form: placeholders: user: - twitter: twitter.com/ linkedin: linkedin.com/ + twitter: twitter.com/ diff --git a/config/locales/models/account/tr.yml b/config/locales/models/account/tr.yml index 8f5fb65c7..027d28799 100644 --- a/config/locales/models/account/tr.yml +++ b/config/locales/models/account/tr.yml @@ -1,88 +1,89 @@ +--- tr: - activerecord: - attributes: - employee: &employee_attributes - is_active: Aktif mi? - title_id: Ünvan - user_id: Kullanıcı - id_number: Kimlik Numarası - duty: &duty_attributes - tenure_status: Kadro Durumu - tenure: Kadrolu - temporary: Geçici Görevlendirme - start_date: Başlangıç Tarihi - end_date: Bitiş Tarihi - employee_id: Personel - unit_id: Birim - position: &position_attributes - administrative_function_id: Görev - start_date: Başlangıç Tarihi - end_date: Bitiş Tarihi - helpers: - submit: - employee: - create: Personel Kaydı Oluştur - update: Personel Kaydını Güncelle - duty: - create: Görevlendirme Oluştur - update: Görevlendirmeyi Güncelle - position: - create: İdari Görev Oluştur - update: İdari Görevi Güncelle account: - employees: - new: - form_title: Personel Kaydı Oluştur - edit: - form_title: Personel Kaydını Güncelle - create: - success: Personel kaydı başarıyla oluşturuldu. - destroy: - success: Personel kaydı başarıyla silindi. - warning: Personel kaydı silinemedi! - update: - success: Personel kaydı başarıyla güncellendi. duties: - new: - form_title: Görevlendirme Oluştur - edit: - form_title: Görevlendirmeyi Güncelle create: success: Görevlendirme başarıyla oluşturuldu. destroy: success: Görevlendirme başarıyla silindi. warning: Görevlendirme silinemedi! + edit: + form_title: Görevlendirmeyi Güncelle + new: + form_title: Görevlendirme Oluştur update: success: Görevlendirme başarıyla güncellendi. - positions: - new: - form_title: İdari Görev Oluştur + employees: + create: + success: Personel kaydı başarıyla oluşturuldu. + destroy: + success: Personel kaydı başarıyla silindi. + warning: Personel kaydı silinemedi! edit: - form_title: İdari Görevi Güncelle + form_title: Personel Kaydını Güncelle + new: + form_title: Personel Kaydı Oluştur + update: + success: Personel kaydı başarıyla güncellendi. + positions: create: success: İdari görev başarıyla oluşturuldu. destroy: success: İdari görev başarıyla silindi. warning: İdari görev silinemedi! + edit: + form_title: İdari Görevi Güncelle + new: + form_title: İdari Görev Oluştur update: success: İdari görev başarıyla güncellendi. profile: edit: - profile_settings: Profil Ayarları - visiblity_settings: Görünürlük Ayarları - phone_number: Telefon numaranız extension_number: Dahili numaranız - website: Web Sayfanız - twitter: Twitter Kullanıcı Adı linkedin: Linkedin Kullanıcı Adı - skype: Skype Kullanıcı Adı orcid: ORCID + phone_number: Telefon numaranız + profile_settings: Profil Ayarları public_photo: Profilimde Fotoğrafımı Göster public_studies: Profilimde Akademik Çalışmalarımı Göster + skype: Skype Kullanıcı Adı + twitter: Twitter Kullanıcı Adı + visiblity_settings: Görünürlük Ayarları + website: Web Sayfanız update: success: Profiliniz başarıyla güncellendi + activerecord: + attributes: + duty: + employee_id: Personel + end_date: Bitiş Tarihi + start_date: Başlangıç Tarihi + temporary: Geçici Görevlendirme + tenure: Kadrolu + tenure_status: Kadro Durumu + unit_id: Birim + employee: + id_number: Kimlik Numarası + is_active: Aktif mi? + title_id: Ünvan + user_id: Kullanıcı + position: + administrative_function_id: Görev + end_date: Bitiş Tarihi + start_date: Başlangıç Tarihi + helpers: + submit: + duty: + create: Görevlendirme Oluştur + update: Görevlendirmeyi Güncelle + employee: + create: Personel Kaydı Oluştur + update: Personel Kaydını Güncelle + position: + create: İdari Görev Oluştur + update: İdari Görevi Güncelle simple_form: placeholders: user: - twitter: twitter.com/ linkedin: linkedin.com/ + twitter: twitter.com/ diff --git a/config/locales/models/addresses/en.yml b/config/locales/models/addresses/en.yml index aa18d11a7..c69917e5f 100644 --- a/config/locales/models/addresses/en.yml +++ b/config/locales/models/addresses/en.yml @@ -2,45 +2,45 @@ en: activerecord: attributes: address: &address_attributes - type: Address Type - phone_number: Phone Number - full_address: Full Address district: District + full_address: Full Address + phone_number: Phone Number + type: Address Type enums: address: types: formal: Formal Address informal: Other Address - simple_form: - hints: - address: - full_address: Neighbourhood, street and door number - helpers: - submit: - address: - create: Save the Address - update: Update the Address account: addresses: + create: + success: Address successfully created! + destroy: + success: Address successfully deleted! + warning: Address can not be deleted! + edit: + form_title: Edit Address + warning: You can not edit your formal address! index: <<: *address_attributes - new_address: Add a New Address card_header: Address Information + create_from_mernis: Create from MERNIS district_and_city: District / City + new_address: Add a New Address update_from_mernis: Update from MERNİS - create_from_mernis: Create from MERNIS new: form_title: Create Address - edit: - warning: You can not edit your formal address! - form_title: Edit Address - create: - success: Address successfully created! - update: - success: Address successfully updated! - destroy: - success: Address successfully deleted! - warning: Address can not be deleted! save_from_mernis: wait: You recently created or updated your address. You can update your address once every week. will_update: We got your address create or update request. In a couple of seconds/minutes you will be able to see your new address. + update: + success: Address successfully updated! + helpers: + submit: + address: + create: Save the Address + update: Update the Address + simple_form: + hints: + address: + full_address: Neighbourhood, street and door number diff --git a/config/locales/models/addresses/tr.yml b/config/locales/models/addresses/tr.yml index 4bf122ea4..3b23fc62c 100644 --- a/config/locales/models/addresses/tr.yml +++ b/config/locales/models/addresses/tr.yml @@ -2,45 +2,45 @@ tr: activerecord: attributes: address: &address_attributes - type: Adres Türü - phone_number: Cep Telefonu Numarası - full_address: Açık Adres district: İlçe + full_address: Açık Adres + phone_number: Cep Telefonu Numarası + type: Adres Türü enums: address: types: formal: Resmi Adres informal: Diğer Adres - simple_form: - hints: - address: - full_address: Mahalle, cadde, sokak, apartman adı ve kapı numarası - helpers: - submit: - address: - create: Adresi Kaydet - update: Adresi Güncelle account: addresses: + create: + success: Adres başarıyla oluşturuldu! + destroy: + success: Adres başarıyla silindi! + warning: Adres silinemedi! + edit: + form_title: Adresi Düzenle + warning: Yasal ikamet adresinizi düzenleyemezsiniz! index: <<: *address_attributes - new_address: Yeni Adres Ekle card_header: Adres Bilgileri + create_from_mernis: MERNİS'ten Oluştur district_and_city: İlçe / İl + new_address: Yeni Adres Ekle update_from_mernis: MERNİS'ten Güncelle - create_from_mernis: MERNİS'ten Oluştur new: form_title: Adres Oluştur - edit: - warning: Yasal ikamet adresinizi düzenleyemezsiniz! - form_title: Adresi Düzenle - create: - success: Adres başarıyla oluşturuldu! - update: - success: Adres başarıyla güncellendi! - destroy: - success: Adres başarıyla silindi! - warning: Adres silinemedi! save_from_mernis: wait: Adresinizi yakın bir zamanda oluşturdunuz veya güncellediniz. Adresinizi haftada bir güncelleyebilirsiniz. will_update: Adres oluşturma veya güncelleme talebinizi aldık, bir kaç saniye/dakika içerisinde adresiniz güncellenecek. + update: + success: Adres başarıyla güncellendi! + helpers: + submit: + address: + create: Adresi Kaydet + update: Adresi Güncelle + simple_form: + hints: + address: + full_address: Mahalle, cadde, sokak, apartman adı ve kapı numarası diff --git a/config/locales/models/calendars/en.yml b/config/locales/models/calendars/en.yml index ce359f9ce..b005ceb9a 100644 --- a/config/locales/models/calendars/en.yml +++ b/config/locales/models/calendars/en.yml @@ -1,28 +1,28 @@ en: activerecord: attributes: - calendar_title: &calendar_title_attributes - name: Calendar Title - academic_term: &academic_term_attributes - year: Year - term: Term - calendar_type: &calendar_type_attributes - name: Calendar Type - calendar_title_type: - type: Type - title: Title - status: Status academic_calendar: &academic_calendar_attributes - name: Calendar Name academic_term: Academic Term calendar_type: Calendar Type + description: Description + name: Calendar Name senate_decision_date: Senate Decision Date senate_decision_no: Senate Decision No - description: Description + academic_term: &academic_term_attributes + term: Term + year: Year calendar_event: calendar_title_id: Title - start_date: Date of Start end_date: Date of End + start_date: Date of Start + calendar_title: &calendar_title_attributes + name: Calendar Title + calendar_title_type: + status: Status + title: Title + type: Type + calendar_type: &calendar_type_attributes + name: Calendar Type enums: academic_term: terms: @@ -31,100 +31,100 @@ en: summer: Summer calendar_title_type: statuses: - passive: Passive active: Active - helpers: - submit: - calendar_title: - create: Create Calendar Title - update: Update Calendar Title - academic_term: - create: Create Academic Term - update: Update Academic Term - calendar_type: - create: Create Calendar Type - update: Update Calendar Type - academic_calendar: - create: Create Academic Calendar - update: Update Academic Calendar + passive: Passive calendar: - calendar_titles: - index: - <<: *calendar_title_attributes - new_calender_title_link: New Calendar Title - card_header: Calendar Titles - new: - form_title: Create a Calendar Title - edit: - form_title: Edit the Calendar Title + academic_calendars: + calendar_event_fields: + delete_event: Delete the Event create: - success: Calendar title successfully created. + success: Academic calendar successfully created. destroy: - success: Calendar title successfully deleted. - warning: Calendar title could not be deleted. + success: Academic calendar successfully deleted + warning: Academic calendar could not be deleted. + edit: + form_title: Update the Academic Calendar + form: + events: Events + new_event_link: Add a New Event + index: + <<: *academic_calendar_attributes + card_header: Academic Calendars + new_academic_calendar_link: New Academic Calendar + new: + form_title: Create an Academic Calendar + show: + <<: *academic_calendar_attributes + alert: Record could not be found! update: - success: Calendar title successfully updated. + success: Academic calendar successfully updated. academic_terms: + create: + success: Academic term successfully created. + destroy: + success: Academic term successfully deleted. + warning: Academic term could not be deleted. + edit: + form_title: Update the Academic Term index: <<: *academic_term_attributes - new_academic_term_link: New Academic Term card_header: Academic Terms + new_academic_term_link: New Academic Term new: form_title: Create a New Academic Term - edit: - form_title: Update the Academic Term + update: + success: Academic term successfully updated. + calendar_titles: create: - success: Academic term successfully created. + success: Calendar title successfully created. destroy: - success: Academic term successfully deleted. - warning: Academic term could not be deleted. + success: Calendar title successfully deleted. + warning: Calendar title could not be deleted. + edit: + form_title: Edit the Calendar Title + index: + <<: *calendar_title_attributes + card_header: Calendar Titles + new_calender_title_link: New Calendar Title + new: + form_title: Create a Calendar Title update: - success: Academic term successfully updated. + success: Calendar title successfully updated. calendar_types: - index: - <<: *calendar_type_attributes - new_calendar_type_link: New Calendar Type - card_header: Calendar Types - form: - new_title_link: New Calendar Title - titles: Calendar Titles calendar_title_type_fields: delete_title_type: Delete Calendar Title - show: - <<: *calendar_type_attributes - card_header: '%{calendar_type} Calendar Type' - new: - form_title: Create a Calendar Type - edit: - form_title: Update the Calendar Type create: success: Calendar type successfully created. destroy: success: Calendar type successfully deleted. warning: Calendar type could not be deleted. - update: - success: Calendar type successfully updated. - academic_calendars: - index: - <<: *academic_calendar_attributes - new_academic_calendar_link: New Academic Calendar - card_header: Academic Calendars + edit: + form_title: Update the Calendar Type form: - new_event_link: Add a New Event - events: Events - calendar_event_fields: - delete_event: Delete the Event + new_title_link: New Calendar Title + titles: Calendar Titles + index: + <<: *calendar_type_attributes + card_header: Calendar Types + new_calendar_type_link: New Calendar Type new: - form_title: Create an Academic Calendar - edit: - form_title: Update the Academic Calendar - create: - success: Academic calendar successfully created. - destroy: - success: Academic calendar successfully deleted - warning: Academic calendar could not be deleted. + form_title: Create a Calendar Type show: - <<: *academic_calendar_attributes - alert: Record could not be found! + <<: *calendar_type_attributes + card_header: '%{calendar_type} Calendar Type' update: - success: Academic calendar successfully updated. + success: Calendar type successfully updated. + helpers: + submit: + academic_calendar: + create: Create Academic Calendar + update: Update Academic Calendar + academic_term: + create: Create Academic Term + update: Update Academic Term + calendar_title: + create: Create Calendar Title + update: Update Calendar Title + calendar_type: + create: Create Calendar Type + update: Update Calendar Type diff --git a/config/locales/models/calendars/tr.yml b/config/locales/models/calendars/tr.yml index eeaf7c3b3..6a36db72f 100644 --- a/config/locales/models/calendars/tr.yml +++ b/config/locales/models/calendars/tr.yml @@ -1,28 +1,28 @@ tr: activerecord: attributes: - calendar_title: &calendar_title_attributes - name: Takvim Başlığı - academic_term: &academic_term_attributes - year: Akademik Yıl - term: Akademik Dönem - calendar_type: &calendar_type_attributes - name: Takvim Türü - calendar_title_type: - type: Tür - title: Başlık - status: Durum academic_calendar: &academic_calendar_attributes - name: Takvim Adı academic_term: Akademik Dönem calendar_type: Takvim Türü + description: Açıklama + name: Takvim Adı senate_decision_date: Senato Karar Tarihi senate_decision_no: Senato Karar No - description: Açıklama + academic_term: &academic_term_attributes + term: Akademik Dönem + year: Akademik Yıl calendar_event: calendar_title_id: Başlık - start_date: Başlama Tarihi end_date: Bitiş Tarihi + start_date: Başlama Tarihi + calendar_title: &calendar_title_attributes + name: Takvim Başlığı + calendar_title_type: + status: Durum + title: Başlık + type: Tür + calendar_type: &calendar_type_attributes + name: Takvim Türü enums: academic_term: terms: @@ -31,100 +31,100 @@ tr: summer: Yaz calendar_title_type: statuses: - passive: Pasif active: Aktif - helpers: - submit: - calendar_title: - create: Takvim Başlığı Oluştur - update: Takvim Başlığını Güncelle - academic_term: - create: Akademik Dönem Oluştur - update: Akademik Dönemi Güncelle - calendar_type: - create: Takvim Türü Oluştur - update: Takvim Türünü Güncelle - academic_calendar: - create: Akademik Takvim Oluştur - update: Akademik Takvimi Güncelle + passive: Pasif calendar: - calendar_titles: - index: - <<: *calendar_title_attributes - new_calender_title_link: Yeni Takvim Başlığı - card_header: Takvim Başlıkları - new: - form_title: Takvim Başlığı Oluştur - edit: - form_title: Takvim Başlığını Güncelle + academic_calendars: + calendar_event_fields: + delete_event: Etkinliği Sil create: - success: Takvim başlığı başarıyla oluşturuldu. + success: Akademik takvim başarıyla oluşturuldu. destroy: - success: Takvim başlığı başarıyla silindi. - warning: Takvim başlığı silinemedi! + success: Akademik takvim başarıyla silindi. + warning: Akademik takvim silinemedi! + edit: + form_title: Akademik Takvimi Düzenle + form: + events: Etkinlikler + new_event_link: Etkinlik Ekle + index: + <<: *academic_calendar_attributes + card_header: Akademik Takvimler + new_academic_calendar_link: Yeni Akademik Takvim + new: + form_title: Akademik Takvim Oluştur + show: + <<: *academic_calendar_attributes + alert: Böyle bir kayıt bulunamadı! update: - success: Takvim başlığı başarıyla güncellendi. + success: Akademik takvim başarıyla güncellendi. academic_terms: + create: + success: Akademik dönem başarıyla oluşturuldu. + destroy: + success: Akademik dönem başarıyla silindi. + warning: Akademik dönem silinemedi! + edit: + form_title: Akademik Dönemi Güncelle index: <<: *academic_term_attributes - new_academic_term_link: Yeni Akademik Dönem card_header: Akademik Dönemler + new_academic_term_link: Yeni Akademik Dönem new: form_title: Akademik Dönem Oluştur - edit: - form_title: Akademik Dönemi Güncelle + update: + success: Akademik dönem başarıyla güncellendi. + calendar_titles: create: - success: Akademik dönem başarıyla oluşturuldu. + success: Takvim başlığı başarıyla oluşturuldu. destroy: - success: Akademik dönem başarıyla silindi. - warning: Akademik dönem silinemedi! + success: Takvim başlığı başarıyla silindi. + warning: Takvim başlığı silinemedi! + edit: + form_title: Takvim Başlığını Güncelle + index: + <<: *calendar_title_attributes + card_header: Takvim Başlıkları + new_calender_title_link: Yeni Takvim Başlığı + new: + form_title: Takvim Başlığı Oluştur update: - success: Akademik dönem başarıyla güncellendi. + success: Takvim başlığı başarıyla güncellendi. calendar_types: - index: - <<: *calendar_type_attributes - new_calendar_type_link: Yeni Takvim Türü - card_header: Takvim Türleri - form: - new_title_link: Yeni Başlık Ekle - titles: Takvim Başlıkları calendar_title_type_fields: delete_title_type: Başlığı Sil - show: - <<: *calendar_type_attributes - card_header: '%{calendar_type} Takvim Türü' - new: - form_title: Takvim Türü Oluştur - edit: - form_title: Takvim Türünü Güncelle create: success: Takvim türü başarıyla oluşturuldu. destroy: success: Takvim türü başarıyla silindi. warning: Takvim türü silinemedi! - update: - success: Takvim türü başarıyla güncellendi. - academic_calendars: - index: - <<: *academic_calendar_attributes - new_academic_calendar_link: Yeni Akademik Takvim - card_header: Akademik Takvimler + edit: + form_title: Takvim Türünü Güncelle form: - new_event_link: Etkinlik Ekle - events: Etkinlikler - calendar_event_fields: - delete_event: Etkinliği Sil + new_title_link: Yeni Başlık Ekle + titles: Takvim Başlıkları + index: + <<: *calendar_type_attributes + card_header: Takvim Türleri + new_calendar_type_link: Yeni Takvim Türü new: - form_title: Akademik Takvim Oluştur - edit: - form_title: Akademik Takvimi Düzenle - create: - success: Akademik takvim başarıyla oluşturuldu. - destroy: - success: Akademik takvim başarıyla silindi. - warning: Akademik takvim silinemedi! + form_title: Takvim Türü Oluştur show: - <<: *academic_calendar_attributes - alert: Böyle bir kayıt bulunamadı! + <<: *calendar_type_attributes + card_header: '%{calendar_type} Takvim Türü' update: - success: Akademik takvim başarıyla güncellendi. + success: Takvim türü başarıyla güncellendi. + helpers: + submit: + academic_calendar: + create: Akademik Takvim Oluştur + update: Akademik Takvimi Güncelle + academic_term: + create: Akademik Dönem Oluştur + update: Akademik Dönemi Güncelle + calendar_title: + create: Takvim Başlığı Oluştur + update: Takvim Başlığını Güncelle + calendar_type: + create: Takvim Türü Oluştur + update: Takvim Türünü Güncelle diff --git a/config/locales/models/committees/en.yml b/config/locales/models/committees/en.yml index 1ca458308..47bf37ee5 100644 --- a/config/locales/models/committees/en.yml +++ b/config/locales/models/committees/en.yml @@ -2,8 +2,8 @@ en: activerecord: attributes: agenda: &agenda_attributes - agenda_type_id: Agenda Type agenda_file: Agenda File + agenda_type_id: Agenda Type description: Agenda Description status: Agenda Status agenda_type: &agenda_type_attributes @@ -13,71 +13,71 @@ en: enums: agenda: statuses: - recent: Recent decided: Decided delayed: Delayed - helpers: - submit: - agenda: - create: Create Agenda - update: Update Agenda - agenda_type: - create: Create Agenda Type - update: Update Agenda Type + recent: Recent committee: - agendas: + agenda_types: + create: + success: Agenda Type successfully created. + destroy: + success: Agenda Type successfully deleted. + warning: Agenda Type can not be deleted! + edit: + form_title: Update the Agenda Type index: - <<: *agenda_attributes - new_agenda_link: Create a New Agenda - card_header: Agendas - unit: Unit - agenda_type: Agenda Type + <<: *agenda_type_attributes + card_header: Agenda Types + new_agenda_type_link: Create a New Agenda Type new: - form_title: Create a Agenda - edit: - form_title: Update a Agenda + form_title: Create a Agenda Type + update: + success: Agenda Type successfully updated. + agendas: create: success: Agenda successfully created. - update: - success: Agenda successfully updated. destroy: success: Agenda successfully deleted. warning: Agenda can not be deleted! + edit: + form_title: Update a Agenda + index: + <<: *agenda_attributes + agenda_type: Agenda Type + card_header: Agendas + new_agenda_link: Create a New Agenda + unit: Unit + new: + form_title: Create a Agenda search: agenda_type_id: Agenda Type smart_search_placeholder: Agenda Description status: Agenda Status - agenda_types: - index: - <<: *agenda_type_attributes - new_agenda_type_link: Create a New Agenda Type - card_header: Agenda Types - new: - form_title: Create a Agenda Type - edit: - form_title: Update the Agenda Type - create: - success: Agenda Type successfully created. update: - success: Agenda Type successfully updated. - destroy: - success: Agenda Type successfully deleted. - warning: Agenda Type can not be deleted! + success: Agenda successfully updated. dashboard: index: agendas: Agendas - name: Committee / Commission Name + card_header: Committee / Commission detsis_id: DETSIS ID - yoksis_id: YOKSIS ID - unit_status: Unit Status - unit_type: Unit Type district: Location - card_header: Committee / Commission + name: Committee / Commission Name new_committee_link: Create a New Committee/Commission + unit_status: Unit Status + unit_type: Unit Type + yoksis_id: YOKSIS ID show: - description: Description - unit: Parent Unit - agenda_type: Agenda Type - status: Agenda Status actions: Actions agenda_card_header: Agendas + agenda_type: Agenda Type + description: Description + status: Agenda Status + unit: Parent Unit + helpers: + submit: + agenda: + create: Create Agenda + update: Update Agenda + agenda_type: + create: Create Agenda Type + update: Update Agenda Type diff --git a/config/locales/models/committees/tr.yml b/config/locales/models/committees/tr.yml index bba8ece57..24feb917b 100644 --- a/config/locales/models/committees/tr.yml +++ b/config/locales/models/committees/tr.yml @@ -2,8 +2,8 @@ tr: activerecord: attributes: agenda: &agenda_attributes - agenda_type_id: Gündem Türü agenda_file: Gündem Dosyası + agenda_type_id: Gündem Türü description: Gündem Açıklaması status: Gündem Durumu agenda_type: &agenda_type_attributes @@ -13,71 +13,71 @@ tr: enums: agenda: statuses: - recent: Yeni decided: Karar Verildi delayed: Ertelendi - helpers: - submit: - agenda: - create: Gündem Oluştur - update: Gündem Güncelle - agenda_type: - create: Gündem Türü Oluştur - update: Gündem Türü Güncelle + recent: Yeni committee: - agendas: + agenda_types: + create: + success: Gündem Türü başarıyla oluşturuldu. + destroy: + success: Gündem Türü başarıyla silindi. + warning: Gündem Türü silinemedi! + edit: + form_title: Gündem Türü Güncelle index: - <<: *agenda_attributes - new_agenda_link: Yeni Bir Gündem Oluştur - card_header: Gündemler - unit: Birim - agenda_type: Gündem Türü + <<: *agenda_type_attributes + card_header: Gündem Türleri + new_agenda_type_link: Yeni Bir Gündem Türü Oluştur new: - form_title: Gündem Oluştur - edit: - form_title: Gündem Güncelle + form_title: Gündem Türü Oluştur + update: + success: Gündem Türü başarıyla güncellendi. + agendas: create: success: Gündem başarıyla oluşturuldu. - update: - success: Gündem başarıyla güncellendi. destroy: success: Gündem başarıyla silindi. warning: Gündem silinemedi! + edit: + form_title: Gündem Güncelle + index: + <<: *agenda_attributes + agenda_type: Gündem Türü + card_header: Gündemler + new_agenda_link: Yeni Bir Gündem Oluştur + unit: Birim + new: + form_title: Gündem Oluştur search: agenda_type_id: Gündem Türü smart_search_placeholder: Gündem Açıklaması status: Gündem Durumu - agenda_types: - index: - <<: *agenda_type_attributes - new_agenda_type_link: Yeni Bir Gündem Türü Oluştur - card_header: Gündem Türleri - new: - form_title: Gündem Türü Oluştur - edit: - form_title: Gündem Türü Güncelle - create: - success: Gündem Türü başarıyla oluşturuldu. update: - success: Gündem Türü başarıyla güncellendi. - destroy: - success: Gündem Türü başarıyla silindi. - warning: Gündem Türü silinemedi! + success: Gündem başarıyla güncellendi. dashboard: index: agendas: Gündemler - name: Kurul / Komisyon Adı + card_header: Kurul / Komisyon detsis_id: DETSIS ID - yoksis_id: YOKSIS ID - unit_status: Birim Durumu - unit_type: Birim Türü district: Bulunduğu İlçe - card_header: Kurul / Komisyon + name: Kurul / Komisyon Adı new_committee_link: Yeni Bir Kurul/Komisyon Oluştur + unit_status: Birim Durumu + unit_type: Birim Türü + yoksis_id: YOKSIS ID show: - description: Açıklama - unit: Üst Birim + actions: İşlemler + agenda_card_header: Gündemler agenda_type: Gündem Türü + description: Açıklama status: Gündem Durumu - actions: İşlemler - agenda_card_header: Gündemler \ No newline at end of file + unit: Üst Birim + helpers: + submit: + agenda: + create: Gündem Oluştur + update: Gündem Güncelle + agenda_type: + create: Gündem Türü Oluştur + update: Gündem Türü Güncelle diff --git a/config/locales/models/course_management/en.yml b/config/locales/models/course_management/en.yml index e416203db..c02c8dcc1 100644 --- a/config/locales/models/course_management/en.yml +++ b/config/locales/models/course_management/en.yml @@ -2,111 +2,114 @@ en: activerecord: attributes: course: &course_attributes - credit: Credit code: Code - program_type: Program Type + credit: Credit laboratory: Laboratory language: Language name: Name practice: Practice + program_type: Program Type status: Status theoric: Theoric unit: Unit + course_group_type: &course_group_type_attributes + name: Course Group Type Name course_unit_group: &course_unit_group_attributes - courses: Courses course_group_type: Course Group Type course_ids: Courses + courses: Courses name: Course Group Name search_placeholder: Course Group Name / Unit Name / Course Group Type Name total_ects_condition: Total ECTS Condition unit: Unit - course_group_type: &course_group_type_attributes - name: Course Group Type Name curriculum: &curriculum_attributes name: Curriculum Name number_of_semesters: Number of Semesters - unit: Unit - status: Status programs: Programs - models: - course: Course - course_unit_group: Course Group - course_group_type: Course Group Type - curriculum: Curriculum + status: Status + unit: Unit enums: course: program_types: associate: Associate - undergraduate: Undergraduate - master: Master doctoral: Doctoral + master: Master + undergraduate: Undergraduate statuses: - passive: Passive active: Active + passive: Passive curriculum: statuses: active: Active passive: Passive + models: + course: Course + course_group_type: Course Group Type + course_unit_group: Course Group + curriculum: Curriculum course_management: - courses: - new: - form_title: Create a Course - edit: - form_title: Update the Course + course_group_types: create: - success: Course successfully created. + success: Course group type created. destroy: - success: Course successfully destroyed. - error: An error occured when deleting the course. - update: - success: Course successfully updated. - search: - smart_search_placeholder: Course name or code - <<: *course_attributes - show: - <<: *course_attributes + warning: An error occured when deleting the course group type. + success: Course group type successfully destroyed. + edit: + form_title: Course Group Type successfully updated. index: - <<: *course_attributes - add_new_course: Add a New Course - courses: Courses - course_unit_groups: + <<: *course_group_type_attributes + card_header: Course Group Types + new_course_group_type_link: Add a New Course Group Type new: - form_title: Course Group successfully created. - show: - name: Course Unit Group Name - total_ects_condition: Total ECTS Condition - unit: Unit - course_group_type: Course Group Type - courses: Courses - edit: - form_title: Course Group successfully updated. + form_title: Course Group Type successfully created. + update: + success: Course group type successfully updated. + course_unit_groups: create: success: Course group created. destroy: - success: Course group successfully destroyed. error: An error occured when deleting the course group. - update: - success: Course group successfully updated. + success: Course group successfully destroyed. + edit: + form_title: Course Group successfully updated. index: <<: *course_unit_group_attributes - new_course_unit_group_link: Add a New Course Group card_header: Course Groups - course_group_types: + new_course_unit_group_link: Add a New Course Group new: - form_title: Course Group Type successfully created. - edit: - form_title: Course Group Type successfully updated. + form_title: Course Group successfully created. + show: + course_group_type: Course Group Type + courses: Courses + name: Course Unit Group Name + total_ects_condition: Total ECTS Condition + unit: Unit + update: + success: Course group successfully updated. + courses: create: - success: Course group type created. + success: Course successfully created. destroy: - success: Course group type successfully destroyed. - error: An error occured when deleting the course group type. - update: - success: Course group type successfully updated. + error: An error occured when deleting the course. + success: Course successfully destroyed. + edit: + form_title: Update the Course index: - <<: *course_group_type_attributes - new_course_group_type_link: Add a New Course Group Type - card_header: Course Group Types + <<: *course_attributes + add_new_course: Add a New Course + courses: Courses + new: + form_title: Create a Course + search: + language: All Languages + program_type: All Program Types + smart_search_placeholder: Course name or code + status: All Statuses + unit: All Units + show: + <<: *course_attributes + update: + success: Course successfully updated. curriculums: create: success: Curriculum successfully created. diff --git a/config/locales/models/course_management/tr.yml b/config/locales/models/course_management/tr.yml index 717a47c94..83064f7d2 100644 --- a/config/locales/models/course_management/tr.yml +++ b/config/locales/models/course_management/tr.yml @@ -2,111 +2,114 @@ tr: activerecord: attributes: course: &course_attributes - credit: Kredi code: Dersin Kodu - program_type: Program Türü + credit: Kredi laboratory: Laboratuvar language: Dil name: Dersin Adı practice: Uygulama + program_type: Program Türü status: Durumu theoric: Teorik unit: Birim + course_group_type: &course_group_type_attributes + name: Ders Grup Tür Adı course_unit_group: &course_unit_group_attributes - courses: Dersler course_group_type: Ders Grup Türü course_ids: Dersler + courses: Dersler name: Ders Grup Adı search_placeholder: Ders Grup Adı / Birim Adı / Ders Grup Türü Adı total_ects_condition: Toplam AKTS Koşulu unit: Birim - course_group_type: &course_group_type_attributes - name: Ders Grup Tür Adı curriculum: &curriculum_attributes - name: Müfredat Adı - unit: Birim - number_of_semesters: Dönem Sayısı - status: Durumu - programs: Programlar - models: - course: Ders - course_unit_group: Ders Grubu - course_group_type: Ders Grup Türü - curriculum: Müfreadat + name: Müfredat Adı + number_of_semesters: Dönem Sayısı + programs: Programlar + status: Durumu + unit: Birim enums: course: program_types: associate: Önlisans - undergraduate: Lisans - master: Yüksek Lisans doctoral: Doktora + master: Yüksek Lisans + undergraduate: Lisans statuses: - passive: Pasif active: Aktif + passive: Pasif curriculum: statuses: - passive: Pasif active: Aktif + passive: Pasif + models: + course: Ders + course_group_type: Ders Grup Türü + course_unit_group: Ders Grubu + curriculum: Müfreadat course_management: - courses: - new: - form_title: Ders Oluştur - edit: - form_title: Dersi Düzenle + course_group_types: create: - success: Ders başarıyla oluşturuldu. + success: Ders grup türü başarıyla oluşturuldu. destroy: - success: Ders başarıyla silindi. - error: Ders silinirken bir hata oluştu. - update: - success: Ders başarıyla güncellendi. - search: - smart_search_placeholder: Ders adı veya kodu - <<: *course_attributes - show: - <<: *course_attributes + warning: Ders grup türü silinirken bir hata oluştu. + success: Ders grup türü başarıyla silindi. + edit: + form_title: Ders Grup Türü Düzenle index: - <<: *course_attributes - add_new_course: Yeni Ders Ekle - courses: Dersler - course_unit_groups: + <<: *course_group_type_attributes + card_header: Ders Grup Türleri + new_course_group_type_link: Yeni Ders Grup Türü Ekle new: - form_title: Ders Grup Oluştur - show: - name: Ders Grup Adı - total_ects_condition: Toplam AKTS Koşulu - unit: Birim - course_group_type: Ders Grup Türü - courses: Dersler - edit: - form_title: Ders Grup Düzenle + form_title: Ders Grup Türü Oluştur + update: + success: Ders grup türü başarıyla güncellendi. + course_unit_groups: create: success: Ders grubu başarıyla oluşturuldu. destroy: - success: Ders grubu başarıyla silindi. error: Ders grubu silinirken bir hata oluştu. - update: - success: Ders grubu başarıyla güncellendi. + success: Ders grubu başarıyla silindi. + edit: + form_title: Ders Grup Düzenle index: <<: *course_unit_group_attributes - new_course_unit_group_link: Yeni Ders Grup Ekle card_header: Ders Grupları - course_group_types: + new_course_unit_group_link: Yeni Ders Grup Ekle new: - form_title: Ders Grup Türü Oluştur - edit: - form_title: Ders Grup Türü Düzenle + form_title: Ders Grup Oluştur + show: + course_group_type: Ders Grup Türü + courses: Dersler + name: Ders Grup Adı + total_ects_condition: Toplam AKTS Koşulu + unit: Birim + update: + success: Ders grubu başarıyla güncellendi. + courses: create: - success: Ders grup türü başarıyla oluşturuldu. + success: Ders başarıyla oluşturuldu. destroy: - success: Ders grup türü başarıyla silindi. - error: Ders grup türü silinirken bir hata oluştu. - update: - success: Ders grup türü başarıyla güncellendi. + error: Ders silinirken bir hata oluştu. + success: Ders başarıyla silindi. + edit: + form_title: Dersi Düzenle index: - <<: *course_group_type_attributes - new_course_group_type_link: Yeni Ders Grup Türü Ekle - card_header: Ders Grup Türleri + <<: *course_attributes + add_new_course: Yeni Ders Ekle + courses: Dersler + new: + form_title: Ders Oluştur + search: + language: Tüm Diller + program_type: Tüm Program Türleri + smart_search_placeholder: Ders adı veya kodu + status: Tüm Durumlar + unit: Tüm Birimler + show: + <<: *course_attributes + update: + success: Ders başarıyla güncellendi. curriculums: create: success: Müfredat başarıyla oluşturuldu. diff --git a/config/locales/models/documents/en.yml b/config/locales/models/documents/en.yml index 00ad75d24..bb43b381d 100644 --- a/config/locales/models/documents/en.yml +++ b/config/locales/models/documents/en.yml @@ -4,28 +4,28 @@ en: document: &document_attributes name: Document Name statement: Statement - helpers: - submit: - document: - create: Create Document - update: Update Document documents: common: documents: Documents - show: - <<: *document_attributes + create: + success: Document successfully created. + destroy: + success: Document successfully deleted! + warning: Document can not be deleted. + edit: + form_title: Update the Document index: <<: *document_attributes - new_document_link: Create a New Document card_header: Documents + new_document_link: Create a New Document new: form_title: Create a Document - edit: - form_title: Update the Document + show: + <<: *document_attributes update: success: Document successfully updated. - create: - success: Document successfully created. - destroy: - success: Document successfully deleted! - warning: Document can not be deleted. + helpers: + submit: + document: + create: Create Document + update: Update Document diff --git a/config/locales/models/documents/tr.yml b/config/locales/models/documents/tr.yml index acd15944d..6c46c598e 100644 --- a/config/locales/models/documents/tr.yml +++ b/config/locales/models/documents/tr.yml @@ -4,28 +4,28 @@ tr: document: &document_attributes name: Belge Adı statement: Açıklama - helpers: - submit: - document: - create: Belge Oluştur - update: Belge Güncelle documents: common: documents: Belgeler - show: - <<: *document_attributes + create: + success: Belge başarıyla oluşturuldu. + destroy: + success: Belge başarıyla silindi! + warning: Belge silinemedi! + edit: + form_title: Belge Güncelle index: <<: *document_attributes - new_document_link: Yeni Belge Oluştur card_header: Belgeler + new_document_link: Yeni Belge Oluştur new: form_title: Belge Oluştur - edit: - form_title: Belge Güncelle + show: + <<: *document_attributes update: success: Belge başarıyla güncellendi. - create: - success: Belge başarıyla oluşturuldu. - destroy: - success: Belge başarıyla silindi! - warning: Belge silinemedi! + helpers: + submit: + document: + create: Belge Oluştur + update: Belge Güncelle diff --git a/config/locales/models/identities/en.yml b/config/locales/models/identities/en.yml index 46bd8eeb2..58599c7a2 100644 --- a/config/locales/models/identities/en.yml +++ b/config/locales/models/identities/en.yml @@ -2,58 +2,58 @@ en: activerecord: attributes: identity: &identity_attributes - type: Identity Type - first_name: First Name - last_name: Last Name - mothers_name: Mothers Name + date_of_birth: Date of Birth fathers_name: Fathers Name + first_name: First Name gender: Gender + last_name: Last Name marital_status: Marital Status + mothers_name: Mothers Name place_of_birth: Place of Birth - date_of_birth: Date of Birth registered_to: Registration + type: Identity Type enums: identity: - types: - formal: Formal Identity - informal: Informal Identity genders: - male: Male female: Female + male: Male other: Other marital_statuses: - single: Single - married: Married divorced: Divorced + married: Married + single: Single unknown: Unknown - helpers: - submit: - identity: - create: Create Identity - update: Update Identity + types: + formal: Formal Identity + informal: Informal Identity account: identities: + create: + success: Identity successfully created! + destroy: + success: Identity successfully deleted! + warning: Identity can not be deleted! + edit: + form_title: Edit Identity + warning: You can not edit your formal identity! index: <<: *identity_attributes + create_from_mernis: Create from MERNIS + department: Department + informal_identity: Informal Identity new_identity: Add a New Identity - user_identity: User Identity student_identity: Student Identity - informal_identity: Informal Identity update_from_mernis: Update from MERNIS - create_from_mernis: Create from MERNIS - department: Department - edit: - warning: You can not edit your formal identity! - form_title: Edit Identity + user_identity: User Identity new: form_title: Create Identity - create: - success: Identity successfully created! - update: - success: Identity successfully updated! - destroy: - success: Identity successfully deleted! - warning: Identity can not be deleted! save_from_mernis: wait: You recently created or updated your identity. You can only update your identity once a week from MERNIS. will_update: We have received your identity create or update request. Your identity will be updated in a couple of seconds/minutes. + update: + success: Identity successfully updated! + helpers: + submit: + identity: + create: Create Identity + update: Update Identity diff --git a/config/locales/models/identities/tr.yml b/config/locales/models/identities/tr.yml index a6d24e9c5..0812e938b 100644 --- a/config/locales/models/identities/tr.yml +++ b/config/locales/models/identities/tr.yml @@ -2,58 +2,58 @@ tr: activerecord: attributes: identity: &identity_attributes - type: Kimlik Türü - first_name: Ad - last_name: Soyad - mothers_name: Anne Adı + date_of_birth: Doğum Tarihi fathers_name: Baba Adı + first_name: Ad gender: Cinsiyet + last_name: Soyad marital_status: Medeni Hal + mothers_name: Anne Adı place_of_birth: Doğum Yeri - date_of_birth: Doğum Tarihi registered_to: Kütük Bilgisi + type: Kimlik Türü enums: identity: - types: - formal: Resmi Kimlik - informal: Diğer Kimlik genders: - male: Erkek female: Kadın + male: Erkek other: Diğer marital_statuses: - single: Bekâr - married: Evli divorced: Boşanmış + married: Evli + single: Bekâr unknown: Bilinmiyor - helpers: - submit: - identity: - create: Kimliği Kaydet - update: Kimliği Güncelle + types: + formal: Resmi Kimlik + informal: Diğer Kimlik account: identities: + create: + success: Kimlik başarıyla oluşturuldu! + destroy: + success: Kimlik başarıyla silindi! + warning: Kimlik silinemedi! + edit: + form_title: Kimliği Düzenle + warning: Yasal kimlik bilgilerinizi düzenleyemezsiniz! index: <<: *identity_attributes + create_from_mernis: MERNİS'ten Oluştur + department: Öğrencilik Birimi + informal_identity: Diğer Kimliğiniz new_identity: Yeni Kimlik Ekle - user_identity: Kullancı Kimliğiniz student_identity: Öğrencilik Kimliğiniz - informal_identity: Diğer Kimliğiniz update_from_mernis: MERNİS'ten Güncelle - create_from_mernis: MERNİS'ten Oluştur - department: Öğrencilik Birimi - edit: - warning: Yasal kimlik bilgilerinizi düzenleyemezsiniz! - form_title: Kimliği Düzenle + user_identity: Kullanıcı Kimliğiniz new: form_title: Kimlik Oluştur - create: - success: Kimlik başarıyla oluşturuldu! - update: - success: Kimlik başarıyla güncellendi! - destroy: - success: Kimlik başarıyla silindi! - warning: Kimlik silinemedi! save_from_mernis: wait: Kimliğinizi yakın bir zamanda oluşturdunuz veya güncellediniz. Kimliğinizi haftada bir güncelleyebilirsiniz. will_update: Kimlik oluşturma veya güncelleme talebinizi aldık, bir kaç saniye/dakika içerisinde adresiniz güncellenecek. + update: + success: Kimlik başarıyla güncellendi! + helpers: + submit: + identity: + create: Kimliği Kaydet + update: Kimliği Güncelle diff --git a/config/locales/models/references/en.yml b/config/locales/models/references/en.yml index 14073b8ee..efb71d894 100644 --- a/config/locales/models/references/en.yml +++ b/config/locales/models/references/en.yml @@ -1,31 +1,31 @@ en: activerecord: attributes: + city: &city_attributes + alpha_2_code: Alpha 2 Code + name: Name of City country: &country_attributes - name: Name of Country alpha_2_code: Alpha 2 Code alpha_3_code: Alpha 3 Code - numeric_code: ISO3166 Numeric mernis_code: MERNIS Code + name: Name of Country + numeric_code: ISO3166 Numeric yoksis_code: YOKSIS Code - city: &city_attributes - name: Name of City - alpha_2_code: Alpha 2 Code district: &district_attributes - name: Name of District - mernis_code: MERNIS Code city_id: City + mernis_code: MERNIS Code + name: Name of District language: &language_attributes - name: Name iso: ISO Code + name: Name helpers: submit: - country: - create: Create Country - update: Update Country city: create: Create City update: Update City + country: + create: Create Country + update: Update Country district: create: Create District update: Update District @@ -33,73 +33,93 @@ en: create: Create Language update: Update Language references: - common: - countries: Ülkeler cities: + create: + success: City successfully created. + destroy: + success: City successfully deleted! + warning: City can not be deleted. + edit: + form_title: Update the City + new: + form_title: Create a City show: <<: *district_attributes + active: Is Active? card_header: Districts new_district_link: Add a New District - active: Is Active? - new: - form_title: Create a City - edit: - form_title: Update the City update: success: City successfully updated. + common: + countries: Ülkeler + countries: create: - success: City successfully created. + success: Country successfully created. destroy: - success: City successfully deleted! - warning: City can not be deleted. - countries: + success: Country successfully deleted. + warning: Country can not be deleted. + edit: + form_title: Edit the Country index: <<: *country_attributes - new_country_link: Add a New Country card_header: Countries + new_country_link: Add a New Country + new: + form_title: Create Country + new_country: New Country show: + <<: *country_attributes <<: *city_attributes card_header: Cities new_city_link: Add a New City - new: - form_title: Create Country - new_country: New Country - edit: - form_title: Edit the Country update: success: Country successfully updated. - create: - success: Country successfully created. - destroy: - success: Country successfully deleted. - warning: Country can not be deleted. districts: - new: - form_title: Create a District - edit: - form_title: Update the District - update: - success: District successfully updated. create: success: District successfully created. destroy: success: District successfully deleted. warning: District can not be deleted. + edit: + form_title: Update the District + new: + form_title: Create a District + update: + success: District successfully updated. + home: + card: + high_school_types: High School Types + languages: Languages + student_disability_types: Disability Types + student_drop_out_types: Drop Out Types + student_education_levels: Education Levels + student_entrance_point_types: Entrance Point Types + student_entrance_types: Entrance Types + student_grades: Grades + student_grading_systems: Grading Systems + student_management: Student Management + student_punishment_types: Punishment Types + student_studentship_statuses: Studentship Statuses + unit_instruction_languages: Instruction Languages + unit_instruction_types: Instruction Types + unit_statuses: Unit Statuses + unit_types: Unit Types + university_types: University Types languages: common: languages: Languages + create: + success: Language successfully created. + destroy: + success: Language successfully deleted! + warning: Language can not be deleted. + edit: + form_title: Update the Language index: <<: *language_attributes - new_language_link: Create a New Language card_header: Languages + new_language_link: Create a New Language new: form_title: Create a Language - edit: - form_title: Update the Language update: success: Language successfully updated. - create: - success: Language successfully created. - destroy: - success: Language successfully deleted! - warning: Language can not be deleted. diff --git a/config/locales/models/references/tr.yml b/config/locales/models/references/tr.yml index b79094b3c..769c91c5f 100644 --- a/config/locales/models/references/tr.yml +++ b/config/locales/models/references/tr.yml @@ -1,31 +1,31 @@ tr: activerecord: attributes: + city: &city_attributes + alpha_2_code: Alpha 2 Kodu + name: Şehir Adı country: &country_attributes - name: Ülke Adı alpha_2_code: Alpha 2 Kodu alpha_3_code: Alpha 3 Kodu - numeric_code: ISO3166 Rakamsal mernis_code: MERNIS Kodu + name: Ülke Adı + numeric_code: ISO3166 Rakamsal yoksis_code: YOKSIS Kodu - city: &city_attributes - name: Şehir Adı - alpha_2_code: Alpha 2 Kodu district: &district_attributes - name: İlçe Adı - mernis_code: MERNIS Kodu city_id: Şehir + mernis_code: MERNIS Kodu + name: İlçe Adı language: &language_attributes - name: Ad iso: ISO Kodu + name: Ad helpers: submit: - country: - create: Ülke Oluştur - update: Ülkeyi Güncelle city: create: Şehir Oluştur update: Şehri Güncelle + country: + create: Ülke Oluştur + update: Ülkeyi Güncelle district: create: İlçe Oluştur update: İlçeyi Güncelle @@ -33,74 +33,93 @@ tr: create: Dil Oluştur update: Dil Güncelle references: - common: - countries: Ülkeler cities: + create: + success: Şehir başarıyla oluşturuldu. + destroy: + success: Şehir başarıyla silindi! + warning: Şehir silinemedi! + edit: + form_title: Şehri Düzenle + new: + form_title: Şehir Oluştur show: <<: *district_attributes + active: Aktiflik Durumu card_header: İlçeler new_district_link: Yeni Bir İlçe Ekle - active: Aktiflik Durumu - new: - form_title: Şehir Oluştur - edit: - form_title: Şehri Düzenle update: success: Şehir başarıyla güncellendi. + common: + countries: Ülkeler + countries: create: - success: Şehir başarıyla oluşturuldu. + success: Ülke başarıyla oluşturuldu. destroy: - success: Şehir başarıyla silindi! - warning: Şehir silinemedi! - countries: + success: Ülke başarıyla silindi! + warning: Ülke silinemedi! + edit: + form_title: Ülkeyi Düzenle index: <<: *country_attributes - new_country_link: Yeni Ülke Ekle card_header: Ülkeler + new_country_link: Yeni Ülke Ekle + new: + form_title: Ülke Oluştur + new_country: Yeni Ülke show: <<: *country_attributes <<: *city_attributes card_header: Şehirler new_city_link: Yeni Şehir Ekle - new: - form_title: Ülke Oluştur - new_country: Yeni Ülke - edit: - form_title: Ülkeyi Düzenle update: success: Ülke başarıyla güncellendi. - create: - success: Ülke başarıyla oluşturuldu. - destroy: - success: Ülke başarıyla silindi! - warning: Ülke silinemedi! districts: - new: - form_title: İlçe Oluştur - edit: - form_title: İlçeyi Düzenle - update: - success: İlçe başarıyla güncellendi. create: success: İlçe başarıyla oluşturuldu. destroy: success: İlçe başarıyla silindi! warning: İlçe silinemedi! + edit: + form_title: İlçeyi Düzenle + new: + form_title: İlçe Oluştur + update: + success: İlçe başarıyla güncellendi. + home: + card: + high_school_types: Lise Türleri + languages: Diller + student_disability_types: Engel Türleri + student_drop_out_types: Ayrılma Nedenleri + student_education_levels: Eğitim Düzeyleri + student_entrance_point_types: Giriş Puan Türleri + student_entrance_types: Giriş Türleri + student_grades: Sınıflar + student_grading_systems: Not Sistemleri + student_management: Öğrenci Yönetimi + student_punishment_types: Ceza Türleri + student_studentship_statuses: Öğrencilik Hakları + unit_instruction_languages: Öğrenim Dilleri + unit_instruction_types: Öğrenim Türleri + unit_statuses: Aktiflik Durumları + unit_types: Birim Türleri + university_types: Üniversite Türleri languages: common: languages: Diller + create: + success: Dil başarıyla oluşturuldu. + destroy: + success: Dil başarıyla silindi! + warning: Dil silinemedi. + edit: + form_title: Dil Güncelle index: <<: *language_attributes - new_language_link: Yeni Dil Oluştur card_header: Diller + new_language_link: Yeni Dil Oluştur new: form_title: Dil Oluştur - edit: - form_title: Dil Güncelle update: success: Dil başarıyla güncellendi. - create: - success: Dil başarıyla oluşturuldu. - destroy: - success: Dil başarıyla silindi! - warning: Dil silinemedi. \ No newline at end of file diff --git a/config/locales/models/registration_documents/en.yml b/config/locales/models/registration_documents/en.yml index 732f05fac..e1985a1fc 100644 --- a/config/locales/models/registration_documents/en.yml +++ b/config/locales/models/registration_documents/en.yml @@ -2,10 +2,10 @@ en: activerecord: attributes: registration_document: ®istration_document_attributes - unit: Unit academic_term: Academic Term document: Document statement: Statement + unit: Unit helpers: submit: registration_document: @@ -14,20 +14,20 @@ en: registration_documents: common: registration_documents: Documents - show: - <<: *registration_document_attributes + create: + success: Document successfully created. + destroy: + success: Document successfully deleted! + warning: Document can not be deleted. + edit: + form_title: Update the Document index: <<: *registration_document_attributes - new_registration_document_link: Create a New Document card_header: '%{unit} Documents Required for Registration' + new_registration_document_link: Create a New Document new: form_title: Create a Document - edit: - form_title: Update the Document + show: + <<: *registration_document_attributes update: success: Document successfully updated. - create: - success: Document successfully created. - destroy: - success: Document successfully deleted! - warning: Document can not be deleted. diff --git a/config/locales/models/registration_documents/tr.yml b/config/locales/models/registration_documents/tr.yml index 9dc19fff3..78aa2c394 100644 --- a/config/locales/models/registration_documents/tr.yml +++ b/config/locales/models/registration_documents/tr.yml @@ -2,10 +2,10 @@ tr: activerecord: attributes: registration_document: ®istration_document_attributes - unit: Birim academic_term: Akademik Dönem document: Belge statement: Açıklama + unit: Birim helpers: submit: registration_document: @@ -14,20 +14,20 @@ tr: registration_documents: common: registration_documents: Belgeler - show: - <<: *registration_document_attributes + create: + success: Belge başarıyla oluşturuldu. + destroy: + success: Belge başarıyla silindi! + warning: Belge silinemedi! + edit: + form_title: Belge Güncelle index: <<: *registration_document_attributes - new_registration_document_link: Yeni Belge Oluştur card_header: '%{unit} Kayıt İçin Gerekli Belgeler' + new_registration_document_link: Yeni Belge Oluştur new: form_title: Belge Oluştur - edit: - form_title: Belge Güncelle + show: + <<: *registration_document_attributes update: success: Belge başarıyla güncellendi. - create: - success: Belge başarıyla oluşturuldu. - destroy: - success: Belge başarıyla silindi! - warning: Belge silinemedi! diff --git a/config/locales/models/student_management/en.yml b/config/locales/models/student_management/en.yml index 05cfde3e1..e568d60ea 100644 --- a/config/locales/models/student_management/en.yml +++ b/config/locales/models/student_management/en.yml @@ -2,77 +2,88 @@ en: activerecord: attributes: prospective_student: &prospective_student_attributes - id_number: ID Number - first_name: First Name - last_name: Last Name - fathers_name: Father's Name - mothers_name: Mother's Name + additional_score: Additional Score + address: Address date_of_birth: Date of Birth + email: Email + exam_score: Exam Score + fathers_name: Father's Name + first_name: First Name gender: Gender - nationality: Nationality - place_of_birth: Place of Birth - registration_city: Registration City - registration_district: Registration District - high_school_code: School Code - high_school_type: School Type + graduated: Graduated high_school_branch: School Branch - state_of_education: State of Education + high_school_code: School Code high_school_graduation_year: High Scholl Graduation Year - placement_type: Placement Type - exam_score: Exam Score - language_id: Language ID - address: Address + high_school_type: School Type home_phone: Home Phone - mobile_phone: Mobile phone - email: Email - student_disability_type_id: Student Disability Type ID - top_student: Top Student - placement_score: Placement Score - placement_rank: Placement Rank - unit: Placement Unit - preference_order: Preference Order - placement_score_type: Placement Score Type - additional_score: Additional Score + id_number: ID Number + language_id: Language ID + last_name: Last Name meb_status: MEB Status meb_status_date: MEB Status Check Date military_status: Military Status military_status_date: Military Status Check Date + mobile_phone: Mobile phone + mothers_name: Mother's Name + must_see_recruiting_office: Must see recruiting unit + nationality: Nationality + not_graduated_or_unknown: Not Graduated/Unknown + obs_registered_program: Registered To obs_status: Studentship Status obs_status_date: Studentship Status Check Date - obs_registered_program: Registered to - graduated: Graduated - not_graduated_or_unknown: Not Graduated/Unknown - unproblematic: Unproblematic - must_see_recruiting_office: Must see recruiting unit - student_in_a_different_unit: Student in a different university/unit + place_of_birth: Place of Birth + placement_rank: Placement Rank + placement_score: Placement Score + placement_score_type: Placement Score Type + placement_type: Placement Type + preference_order: Preference Order + registration_city: Registration City + registration_district: Registration District smart_search_placeholder: Prospective student id number, first name or last name. + state_of_education: State of Education + student_disability_type_id: Student Disability Type ID + student_entrance_type: Entrance Type + student_in_a_different_unit: Student in a different university/unit + top_student: Top Student + unit: Placement Program + unproblematic: Unproblematic enums: prospective_student: + additional_score: + handicapped: Handicapped Additional Score genders: - male: Male female: Female + male: Male nationality: - turkish: Turkish Citizen - kktc: Northern Cyprus Citizen foreign: Foreign Citizen + kktc: Northern Cyprus Citizen + turkish: Turkish Citizen placement_types: - general: General additional_score: Additional Scored - additional_score: - handicapped: Handicapped Additional Score + general: General + simple_form: + labels: + prospective_student: + <<: *prospective_student_attributes student_management: prospective_students: + index: + <<: *prospective_student_attributes + prospective_students: Prospective Students + register: + can_not_register: Can Not Register + warning: Student could not be registered. search: <<: *prospective_student_attributes show: <<: *prospective_student_attributes - prospective_student: Prospective Student + can_not_register: Can Not Register identity_information: Identity Information + last_update: Last Update other_information: Other Information - index: - <<: *prospective_student_attributes - prospective_students: Prospective Students - simple_form: - labels: - prospective_student: - <<: *prospective_student_attributes + permanently_register: Permanently Register + prospective_student: Prospective Student + registered_to: 'Already registered to %{program}.' + temporarily_register: Temporarily Register + redirect_with_success: + success: Student successfully registered diff --git a/config/locales/models/student_management/tr.yml b/config/locales/models/student_management/tr.yml index b58cd0aad..f08e3e31b 100644 --- a/config/locales/models/student_management/tr.yml +++ b/config/locales/models/student_management/tr.yml @@ -2,77 +2,88 @@ tr: activerecord: attributes: prospective_student: &prospective_student_attributes - id_number: Kimlik Numarası - first_name: Ad - last_name: Soyad - fathers_name: Baba Adı - mothers_name: Anne Adı + additional_score: Ek Puan + address: Adres date_of_birth: Doğum Tarihi + email: E-posta + exam_score: Sınav Puanı + fathers_name: Baba Adı + first_name: Ad gender: Cinsiyet - nationality: Uyruk - place_of_birth: Doğum Yeri - registration_city: Nüfusa Kayıtlı Olduğu İl - registration_district: Nüfusa Kayıtlı Olduğu İlçe - high_school_code: Lise Kodu - high_school_type: Lise Türü + graduated: Mezun high_school_branch: Lise Dalı - state_of_education: Öğrenim Durumu + high_school_code: Lise Kodu high_school_graduation_year: Lise Mezuniyet Yılı - placement_type: Yerleşme Türü - exam_score: Sınav Puanı - language_id: Dil ID - address: Adres + high_school_type: Lise Türü home_phone: Ev Telefonu - mobile_phone: Cep Telefonu - email: E-posta - student_disability_type_id: Öğrenci Engel Türü - top_student: Okul Birincisi - placement_score: Yerleşme Puanı - placement_rank: Yerleşme Sırası - unit: Yerleştiği Birim - preference_order: Tercih Sırası - placement_score_type: Yerleşme Puan Türü - additional_score: Ek Puan + id_number: Kimlik Numarası + language_id: Dil ID + last_name: Soyad meb_status: Lise Mezuniyet Durumu meb_status_date: Lise Mezuniyet Kontrol Tarihi military_status: Askerlik Durumu military_status_date: Askerlik Durum Kontrol Tarihi + mobile_phone: Cep Telefonu + mothers_name: Anne Adı + must_see_recruiting_office: Askerlik Şubesiyle Görüşmeli + nationality: Uyruk + not_graduated_or_unknown: Mezun Değil/Bilinmiyor + obs_registered_program: Öğrenci Olarak Kayıtlı Olduğu Program obs_status: Öğrencilik Durumu obs_status_date: Öğrencilik Durum Kontrol Tarihi - obs_registered_program: Öğrenci Olarak Kayıtlı Olduğu Program - graduated: Mezun - not_graduated_or_unknown: Mezun Değil/Bilinmiyor - unproblematic: Sorunsuz - must_see_recruiting_office: Askerlik Şubesiyle Görüşmeli - student_in_a_different_unit: Başka Bir Üniversite/Birimde Öğrenci + place_of_birth: Doğum Yeri + placement_rank: Yerleşme Sırası + placement_score: Yerleşme Puanı + placement_score_type: Yerleşme Puan Türü + placement_type: Yerleşme Türü + preference_order: Tercih Sırası + registration_city: Nüfusa Kayıtlı Olduğu İl + registration_district: Nüfusa Kayıtlı Olduğu İlçe smart_search_placeholder: Aday öğrenci kimlik numarası, adı veya soyadı + state_of_education: Öğrenim Durumu + student_disability_type_id: Öğrenci Engel Türü + student_entrance_type: Giriş Türü + student_in_a_different_unit: Başka Bir Üniversite/Birimde Öğrenci + top_student: Okul Birincisi + unit: Yerleştiği Program + unproblematic: Sorunsuz enums: prospective_student: + additional_score: + handicapped: Engelli Ek Puanı genders: - male: Erkek female: Kadın + male: Erkek nationality: - turkish: Türk Vatandaşı - kktc: Kuzey Kıbrıs Türk Vatandaşı foreign: Yabancı Uyruklu + kktc: Kuzey Kıbrıs Türk Vatandaşı + turkish: Türk Vatandaşı placement_types: - general: Genel additional_score: Ek Puanlı - additional_score: - handicapped: Engelli Ek Puanı + general: Genel + simple_form: + labels: + prospective_student: + <<: *prospective_student_attributes student_management: prospective_students: + index: + <<: *prospective_student_attributes + prospective_students: Aday Öğrenciler + register: + can_not_register: Kayıt Yapılamaz + warning: Öğrenci kayıt edilemedi search: <<: *prospective_student_attributes show: <<: *prospective_student_attributes - prospective_student: Aday Öğrenci + can_not_register: Kayıt Yapılamaz identity_information: Kimlik Bilgileri + last_update: Son Güncelleme other_information: Diğer Bilgileri - index: - <<: *prospective_student_attributes - prospective_students: Aday Öğrenciler - simple_form: - labels: - prospective_student: - <<: *prospective_student_attributes + permanently_register: Kesin Kayıt Yap + prospective_student: Aday Öğrenci + registered_to: '%{program} isimli programda kayıtlı.' + temporarily_register: Geçici Kayıt Yap + redirect_with_success: + success: Öğrenci başarıyla kayıt edildi diff --git a/config/locales/models/studies/en.yml b/config/locales/models/studies/en.yml index 53245dbef..8148c047c 100644 --- a/config/locales/models/studies/en.yml +++ b/config/locales/models/studies/en.yml @@ -1,17 +1,17 @@ en: studies: - dashboard: - index: - articles: Articles - projects: Projects - certifications: Certifications articles: index: article: Article - top_publishers: Top Publishing Academics - recently_added: Recently Added Articles number_of_articles_by_years: Number of Articles by Years publications_by_index_types: Publications by Index Types - publications_by_publication_types: Publications by Publication Types publications_by_language: Publications by Publication Language publications_by_number_of_authors: Publications by Number of Authors + publications_by_publication_types: Publications by Publication Types + recently_added: Recently Added Articles + top_publishers: Top Publishing Academics + dashboard: + index: + articles: Articles + certifications: Certifications + projects: Projects diff --git a/config/locales/models/studies/tr.yml b/config/locales/models/studies/tr.yml index 8d64426e8..bed83b445 100644 --- a/config/locales/models/studies/tr.yml +++ b/config/locales/models/studies/tr.yml @@ -1,17 +1,17 @@ tr: studies: - dashboard: - index: - articles: Makaleler - projects: Projeler - certifications: Sertifikalar articles: index: article: Makale - top_publishers: En Çok Makalesi Olanlar - recently_added: En Son Eklenen Makaleler number_of_articles_by_years: Yıllara Göre Makale Sayısı publications_by_index_types: Index Türüne Göre Makaleler - publications_by_publication_types: Yayın Türüne Göre Makaleler publications_by_language: Yayın Dili Göre Makaleler publications_by_number_of_authors: Yazar Sayısına Göre Makaleler + publications_by_publication_types: Yayın Türüne Göre Makaleler + recently_added: En Son Eklenen Makaleler + top_publishers: En Çok Makalesi Olanlar + dashboard: + index: + articles: Makaleler + certifications: Sertifikalar + projects: Projeler diff --git a/config/locales/models/units/en.yml b/config/locales/models/units/en.yml index baa5b9031..11309dc81 100644 --- a/config/locales/models/units/en.yml +++ b/config/locales/models/units/en.yml @@ -2,20 +2,20 @@ en: activerecord: attributes: unit: &unit_attributes - name: Unit Name - yoksis_id: YOKSIS ID + ancestry: Parent/Children Unit detsis_id: DETSIS ID + district: Location + duration: Duration of Instruction foet_code: FOET Code founded_at: Founded At - duration: Duration of Instruction - district: Location - ancestry: Parent/Children Unit - unit_type: Unit Type - unit_status: Unit Status + name: Unit Name + parent_id: Parent Unit unit_instruction_language: Instruction Language unit_instruction_type: Instruction Type + unit_status: Unit Status + unit_type: Unit Type university_type: University Type - parent_id: Parent Unit + yoksis_id: YOKSIS ID helpers: submit: unit: @@ -24,28 +24,28 @@ en: units: common: units: Units + create: + success: Unit successfully created. + destroy: + success: Unit successfully deleted! + warning: Unit can not be deleted. + edit: + form_title: Update the Unit + index: + <<: *unit_attributes + card_header: Units + new_unit_link: Create a New Unit + new: + form_title: Create a Unit search: - smart_search_placeholder: Unit name or YOKSIS ID duration: Duration of Instruction - unit_status: Unit Status + smart_search_placeholder: Unit name or YOKSIS ID unit_instruction_language: Language of Instruction unit_instruction_type: Instruction Type + unit_status: Unit Status show: <<: *unit_attributes parent: Parent Unit registration_documents: Registration Documents - index: - <<: *unit_attributes - new_unit_link: Create a New Unit - card_header: Units - new: - form_title: Create a Unit - edit: - form_title: Update the Unit update: success: Unit successfully updated. - create: - success: Unit successfully created. - destroy: - success: Unit successfully deleted! - warning: Unit can not be deleted. diff --git a/config/locales/models/units/tr.yml b/config/locales/models/units/tr.yml index 85dd20f0e..73e55386b 100644 --- a/config/locales/models/units/tr.yml +++ b/config/locales/models/units/tr.yml @@ -2,20 +2,20 @@ tr: activerecord: attributes: unit: &unit_attributes - name: Birim Adı - yoksis_id: YOKSIS ID + ancestry: Üst/Alt Birim detsis_id: DETSIS ID + district: Bulunduğu İlçe + duration: Öğretim Süresi foet_code: FOET Kodu founded_at: Kuruluş Tarihi - duration: Öğretim Süresi - district: Bulunduğu İlçe - ancestry: Üst/Alt Birim - unit_type: Birim Türü - unit_status: Birim Durumu + name: Birim Adı + parent_id: Üst Birim unit_instruction_language: Öğretim Dili unit_instruction_type: Öğretim Türü + unit_status: Birim Durumu + unit_type: Birim Türü university_type: Üniversite Türü - parent_id: Üst Birim + yoksis_id: YOKSIS ID helpers: submit: unit: @@ -24,28 +24,28 @@ tr: units: common: units: Birimler + create: + success: Birim başarıyla oluşturuldu. + destroy: + success: Birim başarıyla silindi! + warning: Birim silinemedi! + edit: + form_title: Birim Güncelle + index: + <<: *unit_attributes + card_header: Birimler + new_unit_link: Yeni Birim Oluştur + new: + form_title: Birim Oluştur search: - smart_search_placeholder: Birim adı veya YOKSIS numarası duration: Öğretim Süresi - unit_status: Birim Durumu + smart_search_placeholder: Birim adı veya YOKSIS numarası unit_instruction_language: Öğretim Dili unit_instruction_type: Öğretim Türü + unit_status: Birim Durumu show: <<: *unit_attributes parent: Üst Birim registration_documents: Gerekli Belgeler - index: - <<: *unit_attributes - new_unit_link: Yeni Birim Oluştur - card_header: Birimler - new: - form_title: Birim Oluştur - edit: - form_title: Birim Güncelle update: success: Birim başarıyla güncellendi. - create: - success: Birim başarıyla oluşturuldu. - destroy: - success: Birim başarıyla silindi! - warning: Birim silinemedi! diff --git a/config/locales/models/user/en.yml b/config/locales/models/user/en.yml index acde8fd3e..5ca30fb5f 100644 --- a/config/locales/models/user/en.yml +++ b/config/locales/models/user/en.yml @@ -1,114 +1,113 @@ en: activerecord: attributes: - user: &user_attributes - id_number: ID Number - email: E-mail - password: Password - password_confirmation: Password Confirmation - current_password: Current Password - preferred_language: Preferred Language - password_changed_at: Last Password Change - articles_count: Articles Count - projects_count: Projects Count - profile: Profile Settings - preferences: Visibility Settings + duty: &duty_attributes + employee_id: Employee + end_date: End Date + start_date: Start Date + temporary: Temporary Duty + tenure: Tenure + tenure_status: Tenure Status + unit_id: Unit employee: &employee_attributes + id_number: ID Number is_active: Is Active? title_id: Title user_id: User - id_number: ID Number - duty: &duty_attributes - tenure_status: Tenure Status - tenure: Tenure - temporary: Temporary Duty - start_date: Start Date - end_date: End Date - employee: Employee - unit_id: Unit position: &position_attributes administrative_function_id: Administrative Function - start_date: Start Date end_date: End Date - simple_form: - placeholders: - user: - <<: *user_attributes - helpers: - submit: - user: - update: Change my Password + start_date: Start Date + user: &user_attributes + articles_count: Articles Count + current_password: Current Password + email: E-mail + id_number: ID Number + password: Password + password_changed_at: Last Password Change + password_confirmation: Password Confirmation + preferences: Visibility Settings + preferred_language: Preferred Language + profile: Profile Settings + projects_count: Projects Count devise: common: - reset_password: Reset Password login: Login register: Register + reset_password: Reset Password passwords: edit: reset_my_password: Reset my Password new: - send_instructions: Send Reset Password Instructions hint: You can request password reset instruction by typing your e-mail. + send_instructions: Send Reset Password Instructions registrations: edit: account_settings: Account Settings - leave_blank: leave blank if you don't want to change current_password: you must enter your current password for changing your e-mail address + leave_blank: leave blank if you don't want to change new: - did_you_forget: Forgot Your Password? create_your_account: Create Your Account + did_you_forget: Forgot Your Password? sessions: new: - login_to_your_account: Login to your account + create_account: Create Account did_you_forget: Forgot your password? - remember_login: Remember Login + login_to_your_account: Login to your account registration_description: Students and staff joining to our university need to create an account by registering. - create_account: Create Account + remember_login: Remember Login + helpers: + submit: + user: + update: Change my Password + simple_form: + placeholders: + user: + <<: *user_attributes users: - index: - <<: *user_attributes - card_header: User Accounts - new_user_link: Create a New User - addresses: Addresses - identities: Identities account: <<: *user_attributes addresses: - update_from_mernis: Update from MERNIS create_from_mernis: Create from MERNIS - identities: update_from_mernis: Update from MERNIS - create_from_mernis: Create from MERNIS + create: + success: User successfully created. + destroy: + success: User successfully deleted! + warning: User can not be deleted. + edit: + form_title: Edit Account employees: active: Is Active? - title: Title - employees: Employee Records duties: Duties + employees: Employee Records positions: Positions <<: *employee_attributes <<: *duty_attributes <<: *position_attributes - show: - account: Account - identities: Identities + title: Title + identities: + create_from_mernis: Create from MERNIS + update_from_mernis: Update from MERNIS + index: + <<: *user_attributes addresses: Addresses - employees: Employees - search: + card_header: User Accounts + identities: Identities + new_user_link: Create a New User smart_search_placeholder: TC/YU number, e-mail address, first of last name - edit: - form_title: Edit Account new: form_title: Create Account - update: - success: User successfully updated. - create: - success: User successfully created. - destroy: - success: User successfully deleted! - warning: User can not be deleted. save_address_from_mernis: wait: The address was recently created or updated. You can update the address once a week. will_update: We have received your request to create or update addresses, the address will be updated within a few seconds. save_identity_from_mernis: wait: The identity was recently created or updated. You can update the identity once a week. will_update: We have received your request for an identity creation or an update, and within a few seconds/minutes the identity will be updated. + show: + account: Account + addresses: Addresses + employees: Employees + identities: Identities + update: + success: User successfully updated. \ No newline at end of file diff --git a/config/locales/models/user/tr.yml b/config/locales/models/user/tr.yml index 0a50c77bb..c65c89881 100644 --- a/config/locales/models/user/tr.yml +++ b/config/locales/models/user/tr.yml @@ -1,114 +1,113 @@ tr: activerecord: attributes: - user: &user_attributes - id_number: Kimlik Numarası - email: E-mail Adresi - password: Parola - password_confirmation: Parola (Tekrar) - current_password: Mevcut Şifre - preferred_language: Tercih Edilen Dil - password_changed_at: Son Şifre Değişikliği - articles_count: Makale Sayısı - projects_count: Proje Sayısı - profile: Profil Ayarları - preferences: Görünürlük Ayarları + duty: &duty_attributes + employee_id: Personel + end_date: Bitiş Tarihi + start_date: Başlangıç Tarihi + temporary: Geçici Görevlendirme + tenure: Kadrolu + tenure_status: Kadro Durumu + unit_id: Birim employee: &employee_attributes + id_number: Kimlik Numarası is_active: Aktif mi? title_id: Ünvan user_id: Kullanıcı - id_number: Kimlik Numarası - duty: &duty_attributes - tenure_status: Kadro Durumu - tenure: Kadrolu - temporary: Geçici Görevlendirme - start_date: Başlangıç Tarihi - end_date: Bitiş Tarihi - employee_id: Personel - unit_id: Birim position: &position_attributes administrative_function_id: Görev - start_date: Başlangıç Tarihi end_date: Bitiş Tarihi - simple_form: - placeholders: - user: - <<: *user_attributes - helpers: - submit: - user: - update: Şifremi Değiştir + start_date: Başlangıç Tarihi + user: &user_attributes + articles_count: Makale Sayısı + current_password: Mevcut Şifre + email: E-mail Adresi + id_number: Kimlik Numarası + password: Parola + password_changed_at: Son Şifre Değişikliği + password_confirmation: Parola (Tekrar) + preferences: Görünürlük Ayarları + preferred_language: Tercih Edilen Dil + profile: Profil Ayarları + projects_count: Proje Sayısı devise: common: - reset_password: Şifre Sıfırlama login: Giriş Yap register: Kayıt Ol + reset_password: Şifre Sıfırlama passwords: edit: reset_my_password: Şifremi Sıfırla new: - send_instructions: Şifre Sıfırlama Talimatlarını Gönder hint: Hesabınızda kullandığınız e-mail adresini girerek şifre sıfırlama talimatlarını alabilirsiniz. + send_instructions: Şifre Sıfırlama Talimatlarını Gönder registrations: edit: account_settings: Hesap Ayarları - leave_blank: değiştirmek istemiyorsanız boş bırakın current_password: e-mail adresinizi değiştirebilmek için mevcut şifrenizi girmeniz gerekmektedir + leave_blank: değiştirmek istemiyorsanız boş bırakın new: - did_you_forget: Şifreni mi Unuttun? create_your_account: Hesabınızı oluşturun + did_you_forget: Şifreni mi Unuttun? sessions: new: - login_to_your_account: Hesabınıza giriş yapın + create_account: Hesap Oluştur did_you_forget: Şifreni mi Unuttun? - remember_login: Girişi Hatırla + login_to_your_account: Hesabınıza giriş yapın registration_description: Üniversitemize katılan öğrenci ve personellerin, kayıt olarak kendi hesaplarını oluşturmaları gerekmektedir. - create_account: Hesap Oluştur + remember_login: Girişi Hatırla + helpers: + submit: + user: + update: Şifremi Değiştir + simple_form: + placeholders: + user: + <<: *user_attributes users: - index: - <<: *user_attributes - card_header: Kullanıcı Hesapları - new_user_link: Yeni Kullanıcı Oluştur - addresses: Adres Bilgileri - identities: Kimlik Bilgileri account: <<: *user_attributes addresses: - update_from_mernis: MERNİS'ten Güncelle create_from_mernis: MERNİS'ten Oluştur - identities: update_from_mernis: MERNİS'ten Güncelle - create_from_mernis: MERNİS'ten Oluştur + create: + success: Kullanıcı başarıyla oluşturuldu. + destroy: + success: Kullanıcı başarıyla silindi! + warning: Kullanıcı silinemedi! + edit: + form_title: Hesabı Düzenle employees: active: Aktif mi? - title: Ünvan - employees: Personel Kayıtları duties: Görevlendirmeler + employees: Personel Kayıtları positions: İdari Görevler <<: *employee_attributes <<: *duty_attributes <<: *position_attributes - show: - account: Hesap Bilgileri - identities: Kimlik Bilgileri + title: Ünvan + identities: + create_from_mernis: MERNİS'ten Oluştur + update_from_mernis: MERNİS'ten Güncelle + index: + <<: *user_attributes addresses: Adres Bilgileri - employees: Personel İşlemleri - search: + card_header: Kullanıcı Hesapları + identities: Kimlik Bilgileri + new_user_link: Yeni Kullanıcı Oluştur smart_search_placeholder: TC/YU numarası, e-mail adresi, ad veya soyad - edit: - form_title: Hesabı Düzenle new: form_title: Hesap Oluştur - update: - success: Kullanıcı başarıyla güncellendi. - create: - success: Kullanıcı başarıyla oluşturuldu. - destroy: - success: Kullanıcı başarıyla silindi! - warning: Kullanıcı silinemedi! save_address_from_mernis: wait: Adres yakın bir zamanda oluşturulmuş veya güncellenmiş. Adresi haftada bir güncelleyebilirsiniz. will_update: Adres oluşturma veya güncelleme talebinizi aldık, bir kaç saniye/dakika içerisinde adres güncellenecek. save_identity_from_mernis: wait: Kimlik yakın bir zamanda oluşturulmuş veya güncellenmiş. Kimliği haftada bir güncelleyebilirsiniz. will_update: Kimlik oluşturma veya güncelleme talebinizi aldık, bir kaç saniye/dakika içerisinde kimlik güncellenecek. + show: + account: Hesap Bilgileri + addresses: Adres Bilgileri + employees: Personel İşlemleri + identities: Kimlik Bilgileri + update: + success: Kullanıcı başarıyla güncellendi. \ No newline at end of file diff --git a/config/locales/models/yoksis_references/en.yml b/config/locales/models/yoksis_references/en.yml index 219009384..4b0422a4b 100644 --- a/config/locales/models/yoksis_references/en.yml +++ b/config/locales/models/yoksis_references/en.yml @@ -2,63 +2,63 @@ en: activerecord: attributes: high_school_type: &high_school_type_attributes - name: High School Type code: Code + name: High School Type student_disability_type: &student_disability_type_attributes - name: Student Disability Type code: Code + name: Student Disability Type student_drop_out_type: &student_drop_out_type_attributes - name: Student Drop Out Type code: Code + name: Student Drop Out Type student_education_level: &student_education_level_attributes - name: Student Education Level code: Code + name: Student Education Level student_entrance_point_type: &student_entrance_point_type_attributes - name: Student Entrance Point Type code: Code + name: Student Entrance Point Type student_entrance_type: &student_entrance_type_attributes - name: Student Entrance Type code: Code + name: Student Entrance Type student_grade: &student_grade_attributes - name: Student Grade code: Code + name: Student Grade student_grading_system: &student_grading_system_attributes - name: Student Grading System code: Code + name: Student Grading System student_punishment_type: &student_punishment_type_attributes - name: Student Punishment Type code: Code + name: Student Punishment Type student_studentship_status: &student_studentship_status_attributes - name: Student Studentship Status code: Code + name: Student Studentship Status unit_instruction_language: &unit_instruction_language_attributes - name: Unit Instruction Language code: Code + name: Unit Instruction Language unit_instruction_type: &unit_instruction_type_attributes - name: Unit Instruction Type code: Code + name: Unit Instruction Type unit_status: &unit_status_attributes - name: Unit Statuse code: Code + name: Unit Statuse unit_type: &unit_type_attributes - name: Unit Type code: Code group: Group + name: Unit Type university_type: &university_type_attributes - name: University Type code: Code + name: University Type enums: unit_type: groups: - other: Other - university: University - faculty: Faculty - department: Department - program: Program committee: Committee + department: Department + faculty: Faculty institute: Institute - rectorship: Rectorship major: Major + other: Other + program: Program + rectorship: Rectorship + university: University helpers: submit: high_school_type: @@ -108,242 +108,242 @@ en: update: Update University Type yoksis_references: high_school_types: - index: - <<: *high_school_type_attributes - new_high_school_type_link: New High School Type - card_header: High School Types - new: - form_title: Create a High School Type - edit: - form_title: Update the High School Type create: success: High school type successfully created. destroy: success: High school type successfully deleted. warning: High school type could not be deleted. + edit: + form_title: Update the High School Type + index: + <<: *high_school_type_attributes + card_header: High School Types + new_high_school_type_link: New High School Type + new: + form_title: Create a High School Type update: success: High school type successfully updated. student_disability_types: - index: - <<: *student_disability_type_attributes - new_student_disability_type_link: New Student Disability Type - card_header: Student Disability Types - new: - form_title: Create a Student Disability Type - edit: - form_title: Update the Student Disability Type create: success: Student disability type successfully created. destroy: success: Student disability type successfully deleted. warning: Student disability type could not be deleted. + edit: + form_title: Update the Student Disability Type + index: + <<: *student_disability_type_attributes + card_header: Student Disability Types + new_student_disability_type_link: New Student Disability Type + new: + form_title: Create a Student Disability Type update: success: Student disability type successfully updated. student_drop_out_types: - index: - <<: *student_drop_out_type_attributes - new_student_drop_out_type_link: New Student Type - card_header: Student Types - new: - form_title: Create a Student Drop Out Type - edit: - form_title: Update the Student Drop Out Type create: success: Student drop out type successfully created. destroy: success: Student drop out type successfully deleted. warning: Student drop out type could not be deleted. + edit: + form_title: Update the Student Drop Out Type + index: + <<: *student_drop_out_type_attributes + card_header: Student Types + new_student_drop_out_type_link: New Student Type + new: + form_title: Create a Student Drop Out Type update: success: Student drop out type successfully updated. student_education_levels: - index: - <<: *student_education_level_attributes - new_student_education_level_link: New Student Education Level Type - card_header: Student Education Level Types - new: - form_title: Create a Student Education Level Type - edit: - form_title: Update the Student Education Level Type create: success: Student education level type successfully created. destroy: success: Student education level type successfully deleted. warning: Student education level type could not be deleted. + edit: + form_title: Update the Student Education Level Type + index: + <<: *student_education_level_attributes + card_header: Student Education Level Types + new_student_education_level_link: New Student Education Level Type + new: + form_title: Create a Student Education Level Type update: success: Student education level type successfully updated. student_entrance_point_types: - index: - <<: *student_entrance_point_type_attributes - new_student_entrance_point_type_link: New Student Entrance Point Type - card_header: Student Entrance Point Types - new: - form_title: Create a Student Entrance Point Type - edit: - form_title: Update the Student Entrance Point Type create: success: Student entrance point type successfully created. destroy: success: Student entrance point type successfully deleted. warning: Student entrance point type could not be deleted. + edit: + form_title: Update the Student Entrance Point Type + index: + <<: *student_entrance_point_type_attributes + card_header: Student Entrance Point Types + new_student_entrance_point_type_link: New Student Entrance Point Type + new: + form_title: Create a Student Entrance Point Type update: success: Student entrance point type successfully updated. student_entrance_types: - index: - <<: *student_entrance_type_attributes - new_student_entrance_type_link: New Student Entrance Type - card_header: Student Entrance Types - new: - form_title: Create a Student Entrance Type - edit: - form_title: Update the Student Entrance Type create: success: Student entrance type successfully created. destroy: success: Student entrance type successfully deleted. warning: Student entrance type could not be deleted. + edit: + form_title: Update the Student Entrance Type + index: + <<: *student_entrance_type_attributes + card_header: Student Entrance Types + new_student_entrance_type_link: New Student Entrance Type + new: + form_title: Create a Student Entrance Type update: success: Student entrance type successfully updated. student_grades: - index: - <<: *student_grade_attributes - new_student_grade_link: New Student Grade - card_header: Student Grades - new: - form_title: Create a Student Grade - edit: - form_title: Update the Student Grade create: success: Student grade successfully created. destroy: success: Student grade successfully deleted. warning: Student grade could not be deleted. + edit: + form_title: Update the Student Grade + index: + <<: *student_grade_attributes + card_header: Student Grades + new_student_grade_link: New Student Grade + new: + form_title: Create a Student Grade update: success: Student grade successfully updated. student_grading_systems: - index: - <<: *student_grading_system_attributes - new_student_grading_system_link: New Student Grading System Type - card_header: Student Grading System Types - new: - form_title: Create a Student Grading System Type - edit: - form_title: Update the Student Grading System Type create: success: Student grading system successfully created. destroy: success: Student grading system successfully deleted. warning: Student grading system could not be deleted. + edit: + form_title: Update the Student Grading System Type + index: + <<: *student_grading_system_attributes + card_header: Student Grading System Types + new_student_grading_system_link: New Student Grading System Type + new: + form_title: Create a Student Grading System Type update: success: Student grading system successfully updated. student_punishment_types: - index: - <<: *student_punishment_type_attributes - new_student_punishment_type_link: New Student Punishment Type - card_header: Student Punishment Types - new: - form_title: Create a Student Punishment Type - edit: - form_title: Update the Student Punishment Type create: success: Student punishment type successfully created. destroy: success: Student punishment type successfully deleted. warning: Student punishment type could not be deleted. + edit: + form_title: Update the Student Punishment Type + index: + <<: *student_punishment_type_attributes + card_header: Student Punishment Types + new_student_punishment_type_link: New Student Punishment Type + new: + form_title: Create a Student Punishment Type update: success: Student punishment type successfully updated. student_studentship_statuses: - index: - <<: *student_studentship_status_attributes - new_student_studentship_status_link: New Student Studentship Status - card_header: Student Studentship Statuses - new: - form_title: Create a Student Studentship Status - edit: - form_title: Update the Student Studentship Status create: success: Student studentship status successfully created. destroy: success: Student studentship status successfully deleted. warning: Student studentship status could not be deleted. + edit: + form_title: Update the Student Studentship Status + index: + <<: *student_studentship_status_attributes + card_header: Student Studentship Statuses + new_student_studentship_status_link: New Student Studentship Status + new: + form_title: Create a Student Studentship Status update: success: Student studentship status successfully updated. unit_instruction_languages: - index: - <<: *unit_instruction_language_attributes - new_unit_instruction_language_link: New Unit Instruction Language - card_header: Unit Instruction Languages - new: - form_title: Create a Unit Instruction Language - edit: - form_title: Update the Unit Instruction Language create: success: Unit instruction language successfully created. destroy: success: Unit instruction language successfully deleted. warning: Unit instruction language could not be deleted. + edit: + form_title: Update the Unit Instruction Language + index: + <<: *unit_instruction_language_attributes + card_header: Unit Instruction Languages + new_unit_instruction_language_link: New Unit Instruction Language + new: + form_title: Create a Unit Instruction Language update: success: Unit instruction language successfully updated. unit_instruction_types: - index: - <<: *unit_instruction_type_attributes - new_unit_instruction_type_link: New Unit Instruction Type - card_header: Unit Instruction Types - new: - form_title: Create a Unit Instruction Type - edit: - form_title: Update the Unit Instruction Type create: success: Unit instruction type successfully created. destroy: success: Unit instruction type successfully deleted. warning: Unit instruction type could not be deleted. + edit: + form_title: Update the Unit Instruction Type + index: + <<: *unit_instruction_type_attributes + card_header: Unit Instruction Types + new_unit_instruction_type_link: New Unit Instruction Type + new: + form_title: Create a Unit Instruction Type update: success: Unit instruction type successfully updated. unit_statuses: - index: - <<: *unit_status_attributes - new_unit_status_link: New Unit Status - card_header: Unit Statuses - new: - form_title: Create a Unit Status - edit: - form_title: Update the Unit Status create: success: Unit status successfully created. destroy: success: Unit status successfully deleted. warning: Unit status could not be deleted. + edit: + form_title: Update the Unit Status + index: + <<: *unit_status_attributes + card_header: Unit Statuses + new_unit_status_link: New Unit Status + new: + form_title: Create a Unit Status update: success: Unit status successfully updated. unit_types: - index: - <<: *unit_type_attributes - new_unit_type_link: New Unit Type - card_header: Unit Types - new: - form_title: Create a Unit Type - edit: - form_title: Update the Unit Type create: success: Unit type successfully created. destroy: success: Unit type successfully deleted. warning: Unit type could not be deleted. + edit: + form_title: Update the Unit Type + index: + <<: *unit_type_attributes + card_header: Unit Types + new_unit_type_link: New Unit Type + new: + form_title: Create a Unit Type update: success: Unit type successfully updated. university_types: - index: - <<: *university_type_attributes - new_university_type_link: New University Type - card_header: University Types - new: - form_title: Create a University Type - edit: - form_title: Update the University Type create: success: University type successfully created. destroy: success: University type successfully deleted. warning: University type could not be deleted. + edit: + form_title: Update the University Type + index: + <<: *university_type_attributes + card_header: University Types + new_university_type_link: New University Type + new: + form_title: Create a University Type update: success: University type successfully updated. diff --git a/config/locales/models/yoksis_references/tr.yml b/config/locales/models/yoksis_references/tr.yml index 3f54c481e..ca288c5aa 100644 --- a/config/locales/models/yoksis_references/tr.yml +++ b/config/locales/models/yoksis_references/tr.yml @@ -2,63 +2,63 @@ tr: activerecord: attributes: high_school_type: &high_school_type_attributes - name: Lise Türü code: Kodu + name: Lise Türü student_disability_type: &student_disability_type_attributes - name: Öğrenci Engel Türü code: Kodu + name: Öğrenci Engel Türü student_drop_out_type: &student_drop_out_type_attributes - name: Öğrenci Ayrılma Nedeni code: Kodu + name: Öğrenci Ayrılma Nedeni student_education_level: &student_education_level_attributes - name: Öğrenci Doykm code: Kodu + name: Öğrenci Doykm student_entrance_point_type: &student_entrance_point_type_attributes - name: Öğrenci Giriş Puan Türü code: Kodu + name: Öğrenci Giriş Puan Türü student_entrance_type: &student_entrance_type_attributes - name: Öğrenci Giriş Türü code: Kodu + name: Öğrenci Giriş Türü student_grade: &student_grade_attributes - name: Öğrenci Sınıfı code: Kodu + name: Öğrenci Sınıfı student_grading_system: &student_grading_system_attributes - name: Öğrenci Diploma Not Sistemi code: Kodu + name: Öğrenci Diploma Not Sistemi student_punishment_type: &student_punishment_type_attributes - name: Öğrenci Ceza Türü code: Kodu + name: Öğrenci Ceza Türü student_studentship_status: &student_studentship_status_attributes - name: Öğrencilik Hakkı code: Kodu + name: Öğrencilik Hakkı unit_instruction_language: &unit_instruction_language_attributes - name: Öğrenim Dili code: Kodu + name: Öğrenim Dili unit_instruction_type: &unit_instruction_type_attributes - name: Öğrenim Türü code: Kodu + name: Öğrenim Türü unit_status: &unit_status_attributes - name: Aktiflik Durumu code: Kodu + name: Aktiflik Durumu unit_type: &unit_type_attributes - name: Birim Türü code: Kodu group: Grup + name: Birim Türü university_type: &university_type_attributes - name: Üniversite Türü code: Kodu + name: Üniversite Türü enums: unit_type: groups: - other: Diğer - university: Üniversite - faculty: Fakülte - department: Bölüm - program: Program committee: Kurul + department: Bölüm + faculty: Fakülte institute: Enstitü - rectorship: Rektörlük major: Anabilim Dalı + other: Diğer + program: Program + rectorship: Rektörlük + university: Üniversite helpers: submit: high_school_type: @@ -108,242 +108,242 @@ tr: update: Üniversite Türünü Güncelle yoksis_references: high_school_types: - index: - <<: *high_school_type_attributes - new_high_school_type_link: Yeni Lise Türü - card_header: Lise Türleri - new: - form_title: Lise Türü Oluştur - edit: - form_title: Lise Türünü Güncelle create: success: Lise türü başarıyla oluşturuldu. destroy: success: Lise türü başarıyla silindi. warning: Lise türü silinemedi! + edit: + form_title: Lise Türünü Güncelle + index: + <<: *high_school_type_attributes + card_header: Lise Türleri + new_high_school_type_link: Yeni Lise Türü + new: + form_title: Lise Türü Oluştur update: success: Lise türü başarıyla güncellendi. student_disability_types: - index: - <<: *student_disability_type_attributes - new_student_disability_type_link: Yeni Öğrenci Engel Türü - card_header: Öğrenci Engel Türleri - new: - form_title: Öğrenci Engel Türü Oluştur - edit: - form_title: Öğrenci Engel Türünü Güncelle create: success: Öğrenci engel türü başarıyla oluşturuldu. destroy: success: Öğrenci engel türü başarıyla silindi. warning: Öğrenci engel türü silinemedi! + edit: + form_title: Öğrenci Engel Türünü Güncelle + index: + <<: *student_disability_type_attributes + card_header: Öğrenci Engel Türleri + new_student_disability_type_link: Yeni Öğrenci Engel Türü + new: + form_title: Öğrenci Engel Türü Oluştur update: success: Öğrenci engel türü başarıyla güncellendi. student_drop_out_types: - index: - <<: *student_drop_out_type_attributes - new_student_drop_out_type_link: Yeni Öğrenci Ayrılma Nedeni - card_header: Öğrenci Ayrılma Nedenleri - new: - form_title: Öğrenci Ayrılma Nedeni Oluştur - edit: - form_title: Öğrenci Ayrılma Nedenini Güncelle create: success: Öğrenci ayrılma nedeni başarıyla oluşturuldu. destroy: success: Öğrenci ayrılma nedeni başarıyla silindi. warning: Öğrenci ayrılma nedeni silinemedi! + edit: + form_title: Öğrenci Ayrılma Nedenini Güncelle + index: + <<: *student_drop_out_type_attributes + card_header: Öğrenci Ayrılma Nedenleri + new_student_drop_out_type_link: Yeni Öğrenci Ayrılma Nedeni + new: + form_title: Öğrenci Ayrılma Nedeni Oluştur update: success: Öğrenci ayrılma nedeni başarıyla güncellendi. student_education_levels: - index: - <<: *student_education_level_attributes - new_student_education_level_link: Yeni Öğrenci Doykm - card_header: Öğrenci Doykm - new: - form_title: Öğrenci Doykm Oluştur - edit: - form_title: Öğrenci Doykm Güncelle create: success: Öğrenci doykm başarıyla oluşturuldu. destroy: success: Öğrenci doykm başarıyla silindi. warning: Öğrenci doykm silinemedi! + edit: + form_title: Öğrenci Doykm Güncelle + index: + <<: *student_education_level_attributes + card_header: Öğrenci Doykm + new_student_education_level_link: Yeni Öğrenci Doykm + new: + form_title: Öğrenci Doykm Oluştur update: success: Öğrenci doykm başarıyla güncellendi. student_entrance_point_types: - index: - <<: *student_entrance_point_type_attributes - new_student_entrance_point_type_link: Yeni Öğrenci Giriş Türü - card_header: Öğrenci Giriş Türleri - new: - form_title: Öğrenci Giriş Puan Türü Oluştur - edit: - form_title: Öğrenci Giriş Puan Türünü Güncelle create: success: Öğrenci giriş puan türü başarıyla oluşturuldu. destroy: success: Öğrenci giriş puan türü başarıyla silindi. warning: Öğrenci giriş puan türü silinemedi! + edit: + form_title: Öğrenci Giriş Puan Türünü Güncelle + index: + <<: *student_entrance_point_type_attributes + card_header: Öğrenci Giriş Türleri + new_student_entrance_point_type_link: Yeni Öğrenci Giriş Türü + new: + form_title: Öğrenci Giriş Puan Türü Oluştur update: success: Öğrenci giriş puan türü başarıyla güncellendi. student_entrance_types: - index: - <<: *student_entrance_type_attributes - new_student_entrance_type_link: Yeni Öğrenci Giriş Türü - card_header: Öğrenci Türleri - new: - form_title: Öğrenci Giriş Türü Oluştur - edit: - form_title: Öğrenci Giriş Türünü Güncelle create: success: Öğrenci giriş türü başarıyla oluşturuldu. destroy: success: Öğrenci giriş türü başarıyla silindi. warning: Öğrenci giriş türü silinemedi! + edit: + form_title: Öğrenci Giriş Türünü Güncelle + index: + <<: *student_entrance_type_attributes + card_header: Öğrenci Türleri + new_student_entrance_type_link: Yeni Öğrenci Giriş Türü + new: + form_title: Öğrenci Giriş Türü Oluştur update: success: Öğrenci giriş türü başarıyla güncellendi. student_grades: - index: - <<: *student_grade_attributes - new_student_grade_link: Yeni Öğrenci Sınıfı - card_header: Öğrenci Sınıfı - new: - form_title: Öğrenci Sınıfı Oluştur - edit: - form_title: Öğrenci Sınıfını Güncelle create: success: Öğrenci sınıfı başarıyla oluşturuldu. destroy: success: Öğrenci sınıfı başarıyla silindi. warning: Öğrenci sınıfı silinemedi! + edit: + form_title: Öğrenci Sınıfını Güncelle + index: + <<: *student_grade_attributes + card_header: Öğrenci Sınıfı + new_student_grade_link: Yeni Öğrenci Sınıfı + new: + form_title: Öğrenci Sınıfı Oluştur update: success: Öğrenci sınıfı başarıyla güncellendi. student_grading_systems: - index: - <<: *student_grading_system_attributes - new_student_grading_system_link: Yeni Öğrenci Diploma Not Sistemi - card_header: Öğrenci Diploma Not Sistemleri - new: - form_title: Öğrenci Diploma Not Sistemi Oluştur - edit: - form_title: Öğrenci Diploma Not Sistemini Güncelle create: success: Öğrenci diploma not sistemi başarıyla oluşturuldu. destroy: success: Öğrenci diploma not sistemi başarıyla silindi. warning: Öğrenci diploma not sistemi silinemedi! + edit: + form_title: Öğrenci Diploma Not Sistemini Güncelle + index: + <<: *student_grading_system_attributes + card_header: Öğrenci Diploma Not Sistemleri + new_student_grading_system_link: Yeni Öğrenci Diploma Not Sistemi + new: + form_title: Öğrenci Diploma Not Sistemi Oluştur update: success: Öğrenci diploma not sistemi başarıyla güncellendi. student_punishment_types: - index: - <<: *student_punishment_type_attributes - new_student_punishment_type_link: Yeni Öğrenci Ceza Türü - card_header: Öğrenci Ceza Türleri - new: - form_title: Öğrenci Ceza Türü Oluştur - edit: - form_title: Öğrenci Ceza Türünü Güncelle create: success: Öğrenci ceza türü başarıyla oluşturuldu. destroy: success: Öğrenci ceza türü başarıyla silindi. warning: Öğrenci ceza türü silinemedi! + edit: + form_title: Öğrenci Ceza Türünü Güncelle + index: + <<: *student_punishment_type_attributes + card_header: Öğrenci Ceza Türleri + new_student_punishment_type_link: Yeni Öğrenci Ceza Türü + new: + form_title: Öğrenci Ceza Türü Oluştur update: success: Öğrenci ceza türü başarıyla güncellendi. student_studentship_statuses: - index: - <<: *student_studentship_status_attributes - new_student_studentship_status_link: Yeni Öğrencilik Hakkı - card_header: Öğrencilik Hakları - new: - form_title: Öğrencilik Hakkı Oluştur - edit: - form_title: Öğrencilik Hakkı Güncelle create: success: Öğrencilik hakkı başarıyla oluşturuldu. destroy: success: Öğrencilik hakkı başarıyla silindi. warning: Öğrencilik hakkı silinemedi! + edit: + form_title: Öğrencilik Hakkı Güncelle + index: + <<: *student_studentship_status_attributes + card_header: Öğrencilik Hakları + new_student_studentship_status_link: Yeni Öğrencilik Hakkı + new: + form_title: Öğrencilik Hakkı Oluştur update: success: Öğrencilik hakkı başarıyla güncellendi. unit_instruction_languages: - index: - <<: *unit_instruction_language_attributes - new_unit_instruction_language_link: Yeni Öğrenim Dili - card_header: Öğrenim Dilleri - new: - form_title: Öğrenim Dili Oluştur - edit: - form_title: Öğrenim Dilini Güncelle create: success: Öğrenim Dili başarıyla oluşturuldu. destroy: success: Öğrenim Dili başarıyla silindi. warning: Öğrenim Dili silinemedi! + edit: + form_title: Öğrenim Dilini Güncelle + index: + <<: *unit_instruction_language_attributes + card_header: Öğrenim Dilleri + new_unit_instruction_language_link: Yeni Öğrenim Dili + new: + form_title: Öğrenim Dili Oluştur update: success: Öğrenim Dili başarıyla güncellendi. unit_instruction_types: - index: - <<: *unit_instruction_type_attributes - new_unit_instruction_type_link: Yeni Öğrenim Türü - card_header: Öğrenim Türleri - new: - form_title: Öğrenim Türü Oluştur - edit: - form_title: Öğrenim Türünü Güncelle create: success: Öğrenim türü başarıyla oluşturuldu. destroy: success: Öğrenim türü başarıyla silindi. warning: Öğrenim türü silinemedi! + edit: + form_title: Öğrenim Türünü Güncelle + index: + <<: *unit_instruction_type_attributes + card_header: Öğrenim Türleri + new_unit_instruction_type_link: Yeni Öğrenim Türü + new: + form_title: Öğrenim Türü Oluştur update: success: Öğrenim türü başarıyla güncellendi. unit_statuses: - index: - <<: *unit_status_attributes - new_unit_status_link: Yeni Aktiflik Durumu - card_header: Aktiflik Durumları - new: - form_title: Aktiflik durumu Oluştur - edit: - form_title: Aktiflik durumunu Güncelle create: success: Aktiflik durumu başarıyla oluşturuldu. destroy: success: Aktiflik durumu başarıyla silindi. warning: Aktiflik durumu silinemedi! + edit: + form_title: Aktiflik durumunu Güncelle + index: + <<: *unit_status_attributes + card_header: Aktiflik Durumları + new_unit_status_link: Yeni Aktiflik Durumu + new: + form_title: Aktiflik durumu Oluştur update: success: Aktiflik durumu başarıyla güncellendi. unit_types: - index: - <<: *unit_type_attributes - new_unit_type_link: Yeni Birim Türü - card_header: Birim Türleri - new: - form_title: Birim Türü Oluştur - edit: - form_title: Birim Türünü Güncelle create: success: Birim türü başarıyla oluşturuldu. destroy: success: Birim türü başarıyla silindi. warning: Birim türü silinemedi! + edit: + form_title: Birim Türünü Güncelle + index: + <<: *unit_type_attributes + card_header: Birim Türleri + new_unit_type_link: Yeni Birim Türü + new: + form_title: Birim Türü Oluştur update: success: Birim türü başarıyla güncellendi. university_types: - index: - <<: *university_type_attributes - new_university_type_link: Yeni Üniversite Türü - card_header: Üniversite Türleri - new: - form_title: Üniversite Türü Oluştur - edit: - form_title: Üniversite Türünü Güncelle create: success: Üniversite türü başarıyla oluşturuldu. destroy: success: Üniversite türü başarıyla silindi. warning: Üniversite türü silinemedi! + edit: + form_title: Üniversite Türünü Güncelle + index: + <<: *university_type_attributes + card_header: Üniversite Türleri + new_university_type_link: Yeni Üniversite Türü + new: + form_title: Üniversite Türü Oluştur update: success: Üniversite türü başarıyla güncellendi. diff --git a/config/locales/validators/en.yml b/config/locales/validators/en.yml index 4de41e1b9..bbb81b3c0 100644 --- a/config/locales/validators/en.yml +++ b/config/locales/validators/en.yml @@ -3,18 +3,18 @@ en: address: max_formal: You can have up to %{limit} formal addresses maximum. max_informal: You can add up to %{limit} addresses maximum. - identity: - max_formal: You can have up to %{limit} identities related with your user account. - max_informal: You can create up to %{limit} informal identities. - position: - multiple_active_repetitive: - invalid_end_date: Start date is selected as a date after the end date duty: active_and_tenure: This user already has an active and tenure duty. Edit the existing duty or make it passive in order to create a new one. - multiple_active: This user has already active duty at the selected unit invalid_end_date: Start date is selected as a date after the end date + multiple_active: This user has already active duty at the selected unit employee: active: This user already has an active employee. Edit the existing employee or make it passive in order to create a new one. + identity: + max_formal: You can have up to %{limit} identities related with your user account. + max_informal: You can create up to %{limit} informal identities. image: not_permitted: '%{mime_type} is not an allowed file type. You can upload files in %{extension_whitelist} formats.' size_not_satisfied: File size is not between the permitted range. You can upload files from minimum %{minimum} KBs to maximum %{maximum} MBs. + position: + invalid_end_date: Start date is selected as a date after the end date + multiple_active_repetitive: This employee already has this position in this unit diff --git a/config/locales/validators/tr.yml b/config/locales/validators/tr.yml index 32afb2c8b..c65b3e1bb 100644 --- a/config/locales/validators/tr.yml +++ b/config/locales/validators/tr.yml @@ -3,18 +3,18 @@ tr: address: max_formal: En fazla %{limit} tane ikamet adresi ekleyebilirsiniz. max_informal: En fazla %{limit} tane adres ekleyebilirsiniz. - identity: - max_formal: Kullanıcı hesabınıza ilişkin en fazla %{limit} tane kimliğiniz olabilir. - max_informal: En fazla %{limit} tane kimlik oluşturabilirsiniz. - position: - multiple_active_repetitive: Bu personelin seçilen birimde aktif olarak aynı görevi var! - invalid_end_date: Görev başlangıç tarihi bitiş tarihinden sonraki bir tarih olarak seçilmiş. duty: active_and_tenure: Bu personelin zaten aktif ve kadrolu bir görevi var! Yeni kayıt girmek yerine aktif kaydı düzenleyin veya öncelikle aktif kaydı pasifleştirin. - multiple_active: Personelin seçilen birimde zaten aktif görevlendirmesi var! invalid_end_date: Görev başlangıç tarihi bitiş tarihinden sonraki bir tarih olarak seçilmiş. + multiple_active: Personelin seçilen birimde zaten aktif görevlendirmesi var! employee: active: Bu personelin zaten aktif bir personel kaydı var! Yeni kayıt girmek yerine aktif kaydı düzenleyin veya öncelikle aktif kaydı pasifleştirin. + identity: + max_formal: Kullanıcı hesabınıza ilişkin en fazla %{limit} tane kimliğiniz olabilir. + max_informal: En fazla %{limit} tane kimlik oluşturabilirsiniz. image: not_permitted: '%{mime_type} izin verilen bir dosya türü değil. %{extension_whitelist} türlerinde bir dosya yükleyebilirsiniz' size_not_satisfied: Dosya boyutu izin verilen aralıkta değil. Yükleyeceğiniz dosya en az %{minimum} KB, en çok %{maximum} MB boyutunda olabilir. + position: + invalid_end_date: Görev başlangıç tarihi bitiş tarihinden sonraki bir tarih olarak seçilmiş. + multiple_active_repetitive: Bu personelin seçilen birimde aktif olarak aynı görevi var! diff --git a/config/routes.rb b/config/routes.rb index 3c547d8b4..ec32e5c48 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -33,7 +33,9 @@ end scope module: :student_management do - resources :prospective_students + resources :prospective_students do + get 'register', on: :member + end end draw :references diff --git a/config/routes/references.rb b/config/routes/references.rb index 191730b53..8a2d06d5b 100644 --- a/config/routes/references.rb +++ b/config/routes/references.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true scope module: :references do + get 'references', to: 'home#index' resources :countries do resources :cities, except: [:index] do resources :districts, except: %i[show index] do diff --git a/db/migrate/20180926182120_add_student_entrance_type_to_prospective_students.rb b/db/migrate/20180926182120_add_student_entrance_type_to_prospective_students.rb new file mode 100644 index 000000000..6692cd30c --- /dev/null +++ b/db/migrate/20180926182120_add_student_entrance_type_to_prospective_students.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddStudentEntranceTypeToProspectiveStudents < ActiveRecord::Migration[5.2] + def change + add_reference :prospective_students, :student_entrance_type, index: true + end +end diff --git a/db/migrate/20180926213938_add_registration_status_to_students.rb b/db/migrate/20180926213938_add_registration_status_to_students.rb new file mode 100644 index 000000000..656a6859d --- /dev/null +++ b/db/migrate/20180926213938_add_registration_status_to_students.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +class AddRegistrationStatusToStudents < ActiveRecord::Migration[5.2] + def change + add_column :students, :permanently_registered, :boolean, null: false, default: false + end +end diff --git a/db/schema.rb b/db/schema.rb index 69fe8c6ae..0156a1ef3 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2018_09_19_121858) do +ActiveRecord::Schema.define(version: 2018_09_26_213938) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -400,9 +400,11 @@ t.string "obs_registered_program", limit: 255 t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.bigint "student_entrance_type_id" t.index ["high_school_type_id"], name: "index_prospective_students_on_high_school_type_id" t.index ["language_id"], name: "index_prospective_students_on_language_id" t.index ["student_disability_type_id"], name: "index_prospective_students_on_student_disability_type_id" + t.index ["student_entrance_type_id"], name: "index_prospective_students_on_student_entrance_type_id" t.index ["unit_id"], name: "index_prospective_students_on_unit_id" end @@ -468,6 +470,7 @@ t.bigint "unit_id" t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.boolean "permanently_registered", default: false, null: false t.index ["unit_id"], name: "index_students_on_unit_id" t.index ["user_id"], name: "index_students_on_user_id" end diff --git a/lib/tasks/import/all.rake b/lib/tasks/import/all.rake index 1c235ec83..ff67ec855 100644 --- a/lib/tasks/import/all.rake +++ b/lib/tasks/import/all.rake @@ -5,7 +5,8 @@ namespace :import do task all: %w[ countries yoksis_country_codes - cities districts + cities + districts languages titles high_school_types diff --git a/lib/tasks/post_deploy/generate_permalinks.rake b/lib/tasks/post_deploy/1537989774_generate_permalinks.rake similarity index 100% rename from lib/tasks/post_deploy/generate_permalinks.rake rename to lib/tasks/post_deploy/1537989774_generate_permalinks.rake diff --git a/lib/tasks/post_deploy/1537992373_add_osys_entrance_type_to_prospective_students.rake b/lib/tasks/post_deploy/1537992373_add_osys_entrance_type_to_prospective_students.rake new file mode 100644 index 000000000..3d9ff69fb --- /dev/null +++ b/lib/tasks/post_deploy/1537992373_add_osys_entrance_type_to_prospective_students.rake @@ -0,0 +1,8 @@ +# frozen_string_literal: true + +namespace :post_deploy do + task add_osys_entrance_type_to_prospective_students: :environment do + entrance_type = StudentEntranceType.find_by(code: 1) + ProspectiveStudent.all.update(student_entrance_type_id: entrance_type.id) + end +end diff --git a/lib/tasks/post_deploy/create_unit_type_for_committee.rake b/lib/tasks/post_deploy/create_unit_type_for_committee.rake deleted file mode 100644 index dc806e771..000000000 --- a/lib/tasks/post_deploy/create_unit_type_for_committee.rake +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -namespace :post_deploy do - task create_unit_type_for_committee: :environment do - UnitType.create(name: 'Kurul / Komisyon', code: 200) - end -end diff --git a/public/500.html b/public/500.html index f0cb966b3..be30c53c8 100644 --- a/public/500.html +++ b/public/500.html @@ -1,7 +1,7 @@ - We're sorry, but something went wrong (500) + Üzgünüz, sistem içsel bir hatayla karşılaştı. / We're sorry, but something went wrong (500)