diff --git a/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html b/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html index d7b84fab82e5fbf859a94737f7123741004bdb49..a8e1b349c3450aa9db4d79d9502108ca65d58132 100644 --- a/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html +++ b/src/main/java/org/olat/core/commons/fullWebApp/_content/fullwebapplayout.html @@ -13,6 +13,7 @@ ## hide toolbar on ios with minimal-ui <meta name="viewport" content="minimal-ui, width=device-width, initial-scale=1"> <meta http-equiv="Content-type" content="text/html; charset=utf-8" /> +<meta http-equiv="X-UA-Compatible" content="IE=edge" /> ## <!-- IE cache --> <script type="text/javascript"> /* <![CDATA[ */ diff --git a/src/main/java/org/olat/core/util/i18n/I18nManager.java b/src/main/java/org/olat/core/util/i18n/I18nManager.java index ca766fee3d3579b8a8adab3137082190965d0a40..2ecce3305b3e2808fe099f06f557552fb4986334 100644 --- a/src/main/java/org/olat/core/util/i18n/I18nManager.java +++ b/src/main/java/org/olat/core/util/i18n/I18nManager.java @@ -1217,8 +1217,11 @@ public class I18nManager extends BasicManager { */ public String getLanguageTranslated(String languageKey, boolean overlayEnabled) { // Load it from package without fallback - String translated = getLocalizedString(I18nModule.getCoreFallbackBundle(), "this.language.translated", null, I18nModule - .getAllLocales().get(languageKey), overlayEnabled, false, false, false, 0); + String translated = null; + Locale locale = I18nModule.getAllLocales().get(languageKey); + if(locale != null) { + translated = getLocalizedString(I18nModule.getCoreFallbackBundle(), "this.language.translated", null, locale, overlayEnabled, false, false, false, 0); + } if (translated == null) { // Use the english version as callback translated = getLanguageInEnglish(languageKey, overlayEnabled); diff --git a/src/main/java/org/olat/modules/dialog/DialogElementsController.java b/src/main/java/org/olat/modules/dialog/DialogElementsController.java index 51e1b3a8dda4eedb7197972c06187b0183dfcec2..19a6f0e864270c7222985ee76c10eaf4abc1f0d8 100644 --- a/src/main/java/org/olat/modules/dialog/DialogElementsController.java +++ b/src/main/java/org/olat/modules/dialog/DialogElementsController.java @@ -68,6 +68,7 @@ import org.olat.core.util.Util; import org.olat.core.util.resource.OresHelper; import org.olat.core.util.vfs.Quota; import org.olat.core.util.vfs.VFSContainer; +import org.olat.core.util.vfs.VFSItem; import org.olat.core.util.vfs.VFSLeaf; import org.olat.core.util.vfs.VFSManager; import org.olat.core.util.vfs.VFSMediaResource; @@ -385,13 +386,15 @@ public class DialogElementsController extends BasicController { */ private void doFileDelivery(UserRequest ureq, Long forumKey) { OlatRootFolderImpl forumContainer = getForumContainer(forumKey); - VFSLeaf vl = (VFSLeaf) forumContainer.getItems(new VFSLeafFilter()).get(0); - - //ureq.getDispatchResult().setResultingMediaResource(new FileDialogMediaResource(vl)); - ureq.getDispatchResult().setResultingMediaResource(new VFSMediaResource(vl)); - // do logging - ThreadLocalUserActivityLogger.log(CourseLoggingAction.DIALOG_ELEMENT_FILE_DOWNLOADED, getClass(), - LoggingResourceable.wrapBCFile(vl.getName())); + List<VFSItem> items = forumContainer.getItems(new VFSLeafFilter()); + if(items.size() > 0 && items.get(0) instanceof VFSLeaf) { + VFSLeaf vl = (VFSLeaf)items.get(0); + ureq.getDispatchResult().setResultingMediaResource(new VFSMediaResource(vl)); + ThreadLocalUserActivityLogger.log(CourseLoggingAction.DIALOG_ELEMENT_FILE_DOWNLOADED, getClass(), + LoggingResourceable.wrapBCFile(vl.getName())); + } else { + logError("No file to discuss: " + forumContainer, null); + } } public void event(UserRequest ureq, Component source, Event event) { diff --git a/src/main/java/org/olat/repository/_i18n/LocalStrings_pt_BR.properties b/src/main/java/org/olat/repository/_i18n/LocalStrings_pt_BR.properties index 4eba4bf00d6c5fa0d81862a2ab171f5d5ba4f040..7b71c6edd1c7ebde245fa2612cae6bb2908d7733 100644 --- a/src/main/java/org/olat/repository/_i18n/LocalStrings_pt_BR.properties +++ b/src/main/java/org/olat/repository/_i18n/LocalStrings_pt_BR.properties @@ -267,8 +267,6 @@ csc.intro=Como voc\u00EA quer continuar? csc.label=Como voc\u00EA quer continuar? csc.startwizard=Fa\u00E7a um curso simples com um assistente csc.title=Pr\u00F3ximos passos -del.confirm=Voc\u00EA realmente quer apagar este recurso did\u00E1tico? (est\u00E1 sendo usado por {0} usu\u00E1rios neste momento) -del.confirm.corrupted=$\:del.confirm<div class\='o_error'> Este recurso did\u00E1tico foi identificado como corrompido e, portanto, n\u00E3o pode ser arquivado. Continue a remover o recurso do sistema sem arquivamento. </div> del.header=Apagar recurso did\u00E1tico delete.lifecycle=Excluir semestre delete.lifecycle.confirm=Voc\u00EA realmente deseja excluir semestre "{1}", com as refer\u00EAncias "{0}"?