Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Two fixes: broken links to docs and preferred language selection #1324

Merged
merged 2 commits into from
Nov 11, 2019
Merged

Two fixes: broken links to docs and preferred language selection #1324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c469834
Guard docs pages against bad URLs
fzs Nov 11, 2019
e5f2938
Fix user preferences selecting the wrong preferred locale.
fzs Nov 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/java/com/gitblit/wicket/pages/DocPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ public DocPage(PageParameters params) {

Repository r = getRepository();
RevCommit commit = JGitUtils.getCommit(r, objectId);
if (commit == null) {
setResponsePage(NoDocsPage.class, params);
return;
}

String [] encodings = getEncodings();

// Read raw markup content and transform it to html
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/com/gitblit/wicket/pages/DocsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ public DocsPage(PageParameters params) {
final boolean userCanEdit = currentUser.canEdit(getRepositoryModel());

RevCommit head = JGitUtils.getCommit(r, objectId);
if (head == null) {
setResponsePage(NoDocsPage.class, params);
return;
}
final String commitId = getBestCommitId(head);

List<String> extensions = processor.getAllExtensions();
Expand Down
25 changes: 3 additions & 22 deletions src/main/java/com/gitblit/wicket/pages/EditUserPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,30 +112,11 @@ protected void setupPage(final UserModel userModel) {
final Palette<String> teams = new Palette<String>("teams", new ListModel<String>(
new ArrayList<String>(userTeams)), new CollectionModel<String>(app().users()
.getAllTeamNames()), new StringChoiceRenderer(), 10, false);
Locale locale = userModel.getPreferences().getLocale();
if (locale == null) {
locale = Locale.ENGLISH;
}

Locale locale = userModel.getPreferences().getLocale();
List<Language> languages = UserPage.getLanguages();
Language preferredLanguage = null;
if (locale != null) {
String localeCode = locale.getLanguage();
if (!StringUtils.isEmpty(locale.getCountry())) {
localeCode += "_" + locale.getCountry();
}

for (Language lang : languages) {
if (lang.code.equals(localeCode)) {
// language_COUNTRY match
preferredLanguage = lang;
} else if (preferredLanguage != null && lang.code.startsWith(locale.getLanguage())) {
// language match
preferredLanguage = lang;
}
}
}
final IModel<Language> language = Model.of(preferredLanguage);
Language preferredLanguage = UserPage.getPreferredLanguage(locale, languages);
final IModel<Language> language = Model.of(preferredLanguage);
Form<UserModel> form = new Form<UserModel>("editForm", model) {

private static final long serialVersionUID = 1L;
Expand Down
49 changes: 25 additions & 24 deletions src/main/java/com/gitblit/wicket/pages/UserPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package com.gitblit.wicket.pages;

import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Expand Down Expand Up @@ -167,7 +166,7 @@ protected void addDropDownMenus(List<NavLink> navLinks) {
navLinks.add(menu);
}

public static List<Language> getLanguages(){
static List<Language> getLanguages(){
return Arrays.asList(
new Language("Česky","cs"),
new Language("Deutsch","de"),
Expand All @@ -184,13 +183,32 @@ public static List<Language> getLanguages(){
new Language("簡體中文", "zh_CN"),
new Language("正體中文", "zh_TW"));
}


static Language getPreferredLanguage(Locale locale, List<Language> languages) {
Language preferredLanguage = null;
if (locale != null) {
String localeCode = locale.getLanguage();
if (!StringUtils.isEmpty(locale.getCountry())) {
localeCode += "_" + locale.getCountry();
}

for (Language language : languages) {
if (language.code.equals(localeCode)) {
// language_COUNTRY match
preferredLanguage = language;
} else if (preferredLanguage == null && language.code.startsWith(locale.getLanguage())) {
// language match
preferredLanguage = language;
}
}
}
return preferredLanguage;
}

private void addPreferences(UserModel user) {
// add preferences
Form<Void> prefs = new Form<Void>("prefsForm");

List<Language> languages = getLanguages();

Locale locale = user.getPreferences().getLocale();
if (locale == null) {
// user has not specified language preference
Expand All @@ -203,28 +221,11 @@ private void addPreferences(UserModel user) {
if (sessionLocale != null) {
locale = sessionLocale;
}
} else {

}
}

Language preferredLanguage = null;
if (locale != null) {
String localeCode = locale.getLanguage();
if (!StringUtils.isEmpty(locale.getCountry())) {
localeCode += "_" + locale.getCountry();
}

for (Language language : languages) {
if (language.code.equals(localeCode)) {
// language_COUNTRY match
preferredLanguage = language;
} else if (preferredLanguage != null && language.code.startsWith(locale.getLanguage())) {
// language match
preferredLanguage = language;
}
}
}
List<Language> languages = getLanguages();
Language preferredLanguage = getPreferredLanguage(locale, languages);

final IModel<String> displayName = Model.of(user.getDisplayName());
final IModel<String> emailAddress = Model.of(user.emailAddress == null ? "" : user.emailAddress);
Expand Down