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

Console error displayed for missing gif file associated with missing language flag images #3384

Merged
merged 4 commits into from
Dec 9, 2019
Merged

Console error displayed for missing gif file associated with missing language flag images #3384

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d291ad0
DNN-32474 - Recursive delete option is added
berkarslan-xo Nov 6, 2019
8fd811a
Merge remote-tracking branch 'upstream/release/9.4.x' into release/9.4.x
berkarslan-xo Nov 15, 2019
51a3702
Merge remote-tracking branch 'upstream/release/9.4.x' into release/9.4.x
berkarslan-xo Dec 6, 2019
b0c58c1
MOBINST-30122 - FlagSrc page header icon fix
berkarslan-xo Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion DNN Platform/Library/UI/Skins/Controls/LanguageTokenReplace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using System;
using System.Collections.Specialized;
using System.Globalization;
using System.IO;
using System.Web;

using DotNetNuke.Common;
Expand Down Expand Up @@ -56,6 +57,8 @@ public LanguageTokenReplace()

public class LanguagePropertyAccess : IPropertyAccess
{
private const string FlagIconPhysicalLocation = @"~\images\Flags";
private const string NonExistingFlagIconFileName = "none.gif";
private readonly PortalSettings objPortal;
public LanguageTokenReplace objParent;

Expand All @@ -74,7 +77,8 @@ public string GetProperty(string propertyName, string format, CultureInfo format
case "url":
return NewUrl(objParent.Language);
case "flagsrc":
return "/" + objParent.Language + ".gif";
var mappedGifFile = PathUtils.Instance.MapPath($@"{FlagIconPhysicalLocation}\{objParent.Language}.gif");
return File.Exists(mappedGifFile) ? $"/{objParent.Language}.gif" : $@"/{NonExistingFlagIconFileName}";
case "selected":
return (objParent.Language == CultureInfo.CurrentCulture.Name).ToString();
case "label":
Expand Down