Browse Source

Merge branch 'dev' into issue-#3459

pull/18703/head
honurbu 3 years ago
parent
commit
a6cc66f9f4
  1. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/ar.json
  2. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/cs.json
  3. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/de.json
  4. 7
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json
  5. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/es.json
  6. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/fi.json
  7. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/fr.json
  8. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/hi.json
  9. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/hr.json
  10. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/hu.json
  11. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/is.json
  12. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/it.json
  13. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/nl.json
  14. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pl-PL.json
  15. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pt-BR.json
  16. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/ro-RO.json
  17. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/ru.json
  18. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/sk.json
  19. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/sl.json
  20. 5
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/tr.json
  21. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/vi.json
  22. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json
  23. 3
      abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hant.json
  24. 6
      modules/docs/src/Volo.Docs.Web/DocsUiOptions.cs
  25. 25
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml
  26. 3
      modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/ar.json

@ -466,6 +466,7 @@
"TestimonialSend": "شكرًا لك! لقد تلقينا شهادتك. سنقوم بمراجعتها واتخاذ الخطوة التالية قريبًا.",
"Title": "العنوان",
"TitlePlaceholder": "مطور برامج، مدير تكنولوجيا المعلومات، إلخ.",
"Characters": "الأحرف"
"Characters": "الأحرف",
"ABPTestimonialDescription": "ABP Framework: دعونا نسمع شهادتك"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/cs.json

@ -466,6 +466,7 @@
"TestimonialSend": "Děkujeme! Obdrželi jsme vaše svědectví. Brzy to zkontrolujeme a přijmeme další kroky.",
"Title": "Titul",
"TitlePlaceholder": "Vývojář softwaru, CTO atd.",
"Characters": "znaky"
"Characters": "znaky",
"ABPTestimonialDescription": "ABP Framework: Pojďme slyšet vaši referenci"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/de.json

@ -466,6 +466,7 @@
"TestimonialSend": "Vielen Dank! Wir haben Ihre Bewertung erhalten. Wir werden sie bald überprüfen und den nächsten Schritt unternehmen.",
"Title": "Titel",
"TitlePlaceholder": "Softwareentwickler, CTO usw.",
"Characters": "zeichen"
"Characters": "zeichen",
"ABPTestimonialDescription": "ABP Framework: Lass uns deine Bewertung hören"
}
}

7
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json

@ -468,8 +468,7 @@
"Characters": "characters",
"Testimonial_YourProfilePicture": "Your profile picture (only {0})",
"BootstrapCardTitle": "This is a sample card component built by ABP bootstrap card tag helper.",
"GoSomewhere": "Go somewhere →"
"GoSomewhere": "Go somewhere →",
"ABPTestimonialDescription": "ABP Framework: Let's hear your testimonial"
}
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/es.json

@ -466,6 +466,7 @@
"TestimonialSend": "¡Gracias! Hemos recibido tu testimonio. Lo revisaremos y daremos el próximo paso pronto.",
"Title": "Título",
"TitlePlaceholder": "Desarrollador de software, CTO, etc.",
"Characters": "caracteres"
"Characters": "caracteres",
"ABPTestimonialDescription": "ABP Framework: Escuchemos tu testimonio"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/fi.json

@ -466,6 +466,7 @@
"TestimonialSend": "Kiitos! Olemme vastaanottaneet arvostelusi. Käymme sen läpi ja otamme seuraavan askeleen pian.",
"Title": "Titteli",
"TitlePlaceholder": "Ohjelmistokehittäjä, CTO, jne.",
"Characters": "hahmot"
"Characters": "hahmot",
"ABPTestimonialDescription": "ABP Framework: Kuunnellaanpa sinun suosittelua"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/fr.json

@ -466,6 +466,7 @@
"TestimonialSend": "Merci ! Nous avons bien reçu votre témoignage. Nous le passerons en revue et prendrons la prochaine étape bientôt.",
"Title": "Titre",
"TitlePlaceholder": "Développeur de logiciels, CTO, etc.",
"Characters": "caractères"
"Characters": "caractères",
"ABPTestimonialDescription": "ABP Framework : Écoutons votre témoignage"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/hi.json

@ -466,6 +466,7 @@
"TestimonialSend": "धन्यवाद! हमने आपका साक्षात्कार प्राप्त किया है। हम इसे समीक्षा करेंगे और शीघ्र अगला कदम उठाएंगे।",
"Title": "शीर्षक",
"TitlePlaceholder": "सॉफ़्टवेयर डेवेलपर, सीटीओ, आदि।",
"Characters": "अक्षर"
"Characters": "अक्षर",
"ABPTestimonialDescription": "ABP Framework: आइए आपका प्रशंसापत्र सुनें"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/hr.json

@ -466,6 +466,7 @@
"TestimonialSend": "Hvala vam! Primili smo vašu preporuku. Provjerit ćemo je i uskoro poduzeti sljedeći korak.",
"Title": "Naslov",
"TitlePlaceholder": "Razvojni inženjer, CTO, itd.",
"Characters": "znakovi"
"Characters": "znakovi",
"ABPTestimonialDescription": "ABP Framework: Hajde da čujemo tvoje iskustvo"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/hu.json

@ -466,6 +466,7 @@
"TestimonialSend": "Köszönjük! Megkaptuk az ajánlásod. Hamarosan átnézzük és következő lépéseket teszünk.",
"Title": "Cím",
"TitlePlaceholder": "Szoftvertervező, CTO, stb.",
"Characters": "karakterek"
"Characters": "karakterek",
"ABPTestimonialDescription": "ABP Framework: Halljuk az Ön beszámolóját"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/is.json

@ -466,6 +466,7 @@
"TestimonialSend": "Þakka þér! Við höfum fengið viðmiðuna þína. Við munum fara yfir hana fljótt og taka næsta skref.",
"Title": "Titill",
"TitlePlaceholder": "Hugbúnaðarþróunarmiðill, CTO o.s.frv.",
"Characters": "stafir"
"Characters": "stafir",
"ABPTestimonialDescription": "ABP Framework: Við skulum heyra vitnisburð þinn"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/it.json

@ -466,6 +466,7 @@
"TestimonialSend": "Grazie! ",
"Title": "Titolo",
"TitlePlaceholder": "Sviluppatore di software, CTO ecc.",
"Characters": "caratteri"
"Characters": "caratteri",
"ABPTestimonialDescription": "ABP Framework: Ascoltiamo la tua testimonianza",
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/nl.json

@ -466,6 +466,7 @@
"TestimonialSend": "Bedankt! ",
"Title": "Titel",
"TitlePlaceholder": "Softwareontwikkelaar, CTO enz.",
"Characters": "tekens"
"Characters": "tekens",
"ABPTestimonialDescription": "ABP Framework: Laten we uw getuigenis horen"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pl-PL.json

@ -466,6 +466,7 @@
"TestimonialSend": "Dziękuję! ",
"Title": "Tytuł",
"TitlePlaceholder": "Programista, CTO itp.",
"Characters": "znaki"
"Characters": "znaki",
"ABPTestimonialDescription": "Struktura ABP: Posłuchajmy Twojej opinii"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/pt-BR.json

@ -466,6 +466,7 @@
"TestimonialSend": "Obrigado! ",
"Title": "Título",
"TitlePlaceholder": "Desenvolvedor de software, CTO etc.",
"Characters": "caracteres"
"Characters": "caracteres",
"ABPTestimonialDescription": "Estrutura ABP: vamos ouvir seu depoimento"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/ro-RO.json

@ -466,6 +466,7 @@
"TestimonialSend": "Mulțumesc! ",
"Title": "Titlu",
"TitlePlaceholder": "Dezvoltator software, CTO etc.",
"Characters": "caractere"
"Characters": "caractere",
"ABPTestimonialDescription": "Cadrul ABP: Haideți să vă ascultăm mărturia"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/ru.json

@ -464,6 +464,7 @@
"TestimonialSend": "Спасибо! ",
"Title": "Заголовок",
"TitlePlaceholder": "Разработчик программного обеспечения, технический директор и т. д.",
"Characters": "Символы"
"Characters": "Символы",
"ABPTestimonialDescription": "ABP Framework: давайте послушаем ваш отзыв"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/sk.json

@ -466,6 +466,7 @@
"TestimonialSend": "Ďakujem! ",
"Title": "Názov",
"TitlePlaceholder": "Vývojár softvéru, CTO atď.",
"Characters": "znaky"
"Characters": "znaky",
"ABPTestimonialDescription": "Rámec ABP: Vypočujme si vaše svedectvo"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/sl.json

@ -466,6 +466,7 @@
"TestimonialSend": "Hvala vam! ",
"Title": "Naslov",
"TitlePlaceholder": "Razvijalec programske opreme, tehnični direktor itd.",
"Characters": "znaki"
"Characters": "znaki",
"ABPTestimonialDescription": "Ogrodje ABP: poslušajmo vaše pričevanje"
}
}

5
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/tr.json

@ -419,8 +419,7 @@
"Options": "Seçenekler",
"Follow the links below": "Aşağıdaki bağlantıları takip edin",
"BootstrapCardTitle": "Bu örnek, ABP bootstrap kart tag yardımcısı tarafından oluşturulmuştur.",
"GoSomewhere": "Buraya Git →"
"GoSomewhere": "Buraya Git →",
"ABPTestimonialDescription": "ABP Framework: Referanslarınızı dinleyelim"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/vi.json

@ -466,6 +466,7 @@
"TestimonialSend": "Cảm ơn! ",
"Title": "Tiêu đề",
"TitlePlaceholder": "Nhà phát triển phần mềm, CTO, v.v.",
"Characters": "Ký tự"
"Characters": "Ký tự",
"ABPTestimonialDescription": "Khung ABP: Hãy nghe lời chứng thực của bạn"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hans.json

@ -466,6 +466,7 @@
"TestimonialSend": "谢谢你!",
"Title": "标题",
"TitlePlaceholder": "软件开发人员、CTO等",
"Characters": "字符"
"Characters": "字符",
"ABPTestimonialDescription": "ABP 框架:让我们听听您的感言"
}
}

3
abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/zh-Hant.json

@ -466,6 +466,7 @@
"TestimonialSend": "谢谢你!",
"Title": "标题",
"TitlePlaceholder": "软件开发人员、CTO等",
"Characters": "字符"
"Characters": "字符",
"ABPTestimonialDescription": "ABP 框架:让我们听听您的感言"
}
}

6
modules/docs/src/Volo.Docs.Web/DocsUiOptions.cs

@ -20,6 +20,12 @@ namespace Volo.Docs
/// Default value: True;
/// </summary>
public bool ShowProjectsCombobox = true;
/// <summary>
/// Allows user to see a label in user interface for projects combobox
/// Default value: True;
/// </summary>
public bool ShowProjectsComboboxLabel = true;
/// <summary>
/// If true, allows to create sections in document and show/hide sections according to user preferences.

25
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml

@ -99,18 +99,31 @@
<div class="col-12 mb-2">
<div class="docs-version">
<span>Project</span>
@if (Model.ShowProjectsComboboxLabel)
{
<span>@L["Project"]</span>
}
<div class="version-select">
<div class="input-group">
<span class="input-group-text d-none">
<i class="fa fa-folder-open" aria-hidden="true" data-toggle="tooltip" title="@L["Project"]"></i>
</span>
@if (Model.ShowProjectsComboboxLabel)
{
<div class="input-group">
<span class="input-group-text d-none">
<i class="fa fa-folder-open" aria-hidden="true" data-toggle="tooltip" title="@L["Project"]"></i>
</span>
<select asp-items="Model.ProjectSelectItems"
class="form-select"
onchange="window.location.pathname = this.value">
</select>
</div>
}
else
{
<select asp-items="Model.ProjectSelectItems"
class="form-select"
onchange="window.location.pathname = this.value">
</select>
</div>
}
</div>
</div>

3
modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs

@ -66,6 +66,8 @@ namespace Volo.Docs.Pages.Documents.Project
public string DocumentsUrlPrefix { get; set; }
public bool ShowProjectsCombobox { get; set; }
public bool ShowProjectsComboboxLabel { get; set; }
public bool IsVersionPreview { get; set; }
@ -133,6 +135,7 @@ namespace Volo.Docs.Pages.Documents.Project
{
DocumentsUrlPrefix = _uiOptions.RoutePrefix;
ShowProjectsCombobox = _uiOptions.ShowProjectsCombobox;
ShowProjectsComboboxLabel = ShowProjectsCombobox && _uiOptions.ShowProjectsComboboxLabel;
FullSearchEnabled = await _documentAppService.FullSearchEnabledAsync();
try

Loading…
Cancel
Save