Merge remote-tracking branch 'origin/dev' into feature/embedded-table

pull/6229/head
Oliver Günther 7 years ago
commit 9681c887de
No known key found for this signature in database
GPG Key ID: 88872239EB414F99
  1. 2
      config/locales/crowdin/it.yml
  2. 26
      config/locales/crowdin/js-da.yml
  3. 8
      config/locales/crowdin/sk.yml
  4. 9
      frontend/app/components/table-pagination/pagination-service.ts
  5. 6
      frontend/npm-shrinkwrap.json
  6. 2
      frontend/package.json

@ -2290,7 +2290,7 @@ it:
text_journal_aggregation_time_explanation: Aggrega i rapporti se la loro distanza
temporale è inferiore all'intervallo di tempo specificato. Questo ritarderà inoltre
della stessa quantità di tempo anche le notifiche via posta elettronica.
text_journal_changed: "%{label} changed from %{old} </br><strong>to</strong> %{new}"
text_journal_changed: modificato da %{old} </br><strong>in</strong> %{new} %{label}
text_journal_changed_no_detail: "%{label} aggiornata"
text_journal_changed_with_diff: "%{label} cambiato (%{link})"
text_journal_deleted: "%{label} cancellato (%{old})"

@ -58,8 +58,8 @@ da:
filter:
description:
text_open_filter: Åbn dette filter med 'ALT' og pile tasterne.
text_close_filter: To select an entry leave the focus for example by pressing
enter. To leave without filter select the first (empty) entry.
text_close_filter: For at vælge en post forlade fokuset ved at trykke på Enter.
For at undlade filterbrug vælg den første (tomme) post.
noneElement: "(ingen)"
time_zone_converted:
two_values: "%{from} - %{to} in your local time."
@ -78,9 +78,9 @@ da:
general_text_No: Nej
general_text_Yes: Ja
label_activate: Aktiver
label_activity_no: Activity entry number %{activityNo}
label_activity_with_comment_no: Activity entry number %{activityNo}. Has a user
comment.
label_activity_no: Aktivitetsindlægsnummer %{activityNo}
label_activity_with_comment_no: Aktivitetsindlægsnummer %{activityNo}. Har en
brugerkommentar.
label_add_columns: Add columns
label_add_comment: Tilføj kommentar
label_add_comment_title: Comment and type @ to notify other people
@ -92,7 +92,7 @@ da:
label_all_work_packages: alle arbejdspakker
label_and: og
label_ascending: Stigende
label_author: 'Author: %{user}'
label_author: 'Forfatter: %{user}'
label_between: between
label_board_locked: Låst
label_board_sticky: Fremhævet
@ -154,13 +154,13 @@ da:
label_per_page: 'Per side:'
label_please_wait: Please wait
label_visibility_settings: Visibility settings
label_quote_comment: Quote this comment
label_quote_comment: Citér denne kommentar
label_reset: Nulstil
label_remove_columns: Fjern valgte kolonner
label_save_as: Gem som
label_select_watcher: Vælg en tilsynsførende...
label_selected_filter_list: Valgte filtre
label_show_attributes: Show all attributes
label_show_attributes: Vis alle egenskaber
label_show_in_menu: Vis siden i menu
label_sort_by: Sortér efter
label_sorted_by: sorteret efter
@ -250,7 +250,7 @@ da:
nevermind: Nevermind
watchers:
label_loading: indlæser iagttagere...
label_error_loading: An error occurred while loading the watchers
label_error_loading: En fejl opstod under indlæsning af seere
label_search_watchers: Søg iagttagere
label_add: Tilføj tilsynsførende
label_discard: Kassér valg
@ -426,7 +426,7 @@ da:
delete: Bulk delete
button_clear: Ryd
comment_added: Kommentaren blev tilføjet.
comment_send_failed: An error has occurred. Could not submit the comment.
comment_send_failed: En fejl opstod. Kunne ikke indsende kommentaren.
comment_updated: Kommentaren blev opdateret.
confirm_edit_cancel: Are you sure you want to cancel editing the work package?
description_filter: Filter
@ -440,7 +440,7 @@ da:
format:
date: "%{attribute} is no valid date - YYYY-MM-DD expected."
general: Der opstod en fejl.
edit_attribute: "%{attribute} - Edit"
edit_attribute: "%{attribute}: Redigér"
key_value: "%{key}: %{value}"
label_enable_multi_select: Tillad multimarkeringer
label_disable_multi_select: Slå multimarkeringer fra
@ -540,8 +540,8 @@ da:
summary: Table with rows of work package and columns of work package attributes.
text_inline_edit: Most cells of this table are buttons that activate inline-editing
functionality of that attribute.
text_sort_hint: With the links in the table headers you can sort, group, reorder,
remove and add table columns.
text_sort_hint: Med linksne i tabeloverskrifterne kan du sortere, gruppere,
omarrangere, fjerne og tilføje tabelkolonner.
text_select_hint: Select boxes should be opened with 'ALT' and arrow keys.
tabs:
overview: Overblik

@ -254,8 +254,8 @@ sk:
login_verification:
other: Enter the login %{name} to verify the deletion. Once submitted, you
will be ask to confirm your password.
self: Enter your login %{name} to verify the deletion. Once submitted, you
will be ask to confirm your password.
self: Zadajte váš login %{name} na overenie odstránenia. Po jeho odoslaní
bude potrebné potvrdiť svoje heslo.
error_inactive_activation_by_mail: 'Váš účet ešte nebol aktivovaný. Ak ho chcete
aktivovať, kliknite na odkaz, ktorý bol doručený na Vašu e-mailovú adresu.
@ -437,7 +437,7 @@ sk:
inclusion: nie je nastavená na niektorú z povolených hodnôt.
invalid: je neplatný.
invalid_url: nie je platnou URL adresou.
invalid_url_scheme: 'is not a supported protocol (allowed: %{allowed_schemes}).'
invalid_url_scheme: 'nie je podporovaný protokol (povolené: %{allowed_schemes}).'
less_than_or_equal_to: musí byť menšie alebo rovné ako %{count}.
not_a_date: is not a valid date.
not_a_datetime: is not a valid date time.
@ -2662,7 +2662,7 @@ sk:
or malformed.
multipart_body_error: Telo žiadosti neobsahuje očakávaný viacnásobné časti.
multiple_errors: Boli porušené obmedzenia voči viacerým poliam.
unable_to_create_attachment: The attachment could not be created
unable_to_create_attachment: Prílohu sa nepodarilo vytvoriť
render:
context_not_parsable: Zadaný kontext nie je odkazom na prostriedok.
unsupported_context: Zadaný prostriedok nie je podporovaný ako kontext.

@ -68,10 +68,13 @@ export class PaginationService {
public getCachedPerPage(initialPageOptions:number[]):number {
const value = window.OpenProject.guardedLocalStorage('pagination.perPage') as string;
const perPage = parseInt(value, 10);
if (perPage > 0) {
return perPage;
if (value !== undefined) {
const perPage = parseInt(value, 10);
if (perPage > 0) {
return perPage;
}
}
if (initialPageOptions.length > 0) {

@ -5524,9 +5524,9 @@
"dev": true
},
"typescript": {
"version": "2.7.1",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.7.1.tgz",
"integrity": "sha512-bqB1yS6o9TNA9ZC/MJxM0FZzPnZdtHj0xWK/IZ5khzVqdpGul/R/EIiHRgFXlwTD7PSIaYVnGKq1QgMCu2mnqw=="
"version": "2.8.1",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz",
"integrity": "sha512-Ao/f6d/4EPLq0YwzsQz8iXflezpTkQzqAyenTiw4kCUGr1uPiFLC3+fZ+gMZz6eeI/qdRUqvC+HxIJzUAzEFdg=="
},
"uglify-js": {
"version": "2.8.29",

@ -125,7 +125,7 @@
"style-loader": "^0.8.2",
"ticky": "^1.0.1",
"ts-loader": "^2.3.7",
"typescript": "^2.7.1",
"typescript": "^2.8.1",
"ui-select": "~0.19.6",
"url-loader": "^0.5.7",
"webpack": "^3.10.0",

Loading…
Cancel
Save