litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/Vitro into maint-rel-1.6

Browse source
This commit is contained in:
hudajkhan 2013-11-01 10:41:41 -04:00
commit 90fc8f7ffa
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
View file

@ -102,7 +102,6 @@ public class ImageUploadController extends FreemarkerHttpServlet {
private static final String URL_HERE = UrlBuilder.getUrl("/uploadImages");
private static final String TEXT_BUNDLE = "imageUpload";
private static final String TEXT_STRING_UPLOAD_TITLE = "upload_page_title";
private static final String TEXT_STRING_UPLOAD_TITLE_WITH_NAME = "upload_page_title_with_name";
private static final String TEXT_STRING_REPLACE_TITLE = "replace_page_title";
@ -572,10 +571,10 @@ public class ImageUploadController extends FreemarkerHttpServlet {
if (entity != null) {
String name = entity.getName();
if (name != null) {
return I18n.text(req, TEXT_BUNDLE, nameTitleKey, name);
return I18n.text(req, nameTitleKey, name);
}
}
return I18n.text(req, TEXT_BUNDLE, noNameTitleKey);
return I18n.text(req, noNameTitleKey);
}
/**