diff --git a/src/Umbraco.Core/CompositionExtensions.cs b/src/Umbraco.Core/CompositionExtensions.cs index ced9a9386a..2fcf446d6b 100644 --- a/src/Umbraco.Core/CompositionExtensions.cs +++ b/src/Umbraco.Core/CompositionExtensions.cs @@ -64,7 +64,7 @@ namespace Umbraco.Core => composition.WithCollectionBuilder(); /// - /// Gets the url segment providers collection builder. + /// Gets the URL segment providers collection builder. /// /// The composition. public static UrlSegmentProviderCollectionBuilder UrlSegmentProviders(this Composition composition) diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index 0b817cc0bb..2c79c00086 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -68,9 +68,9 @@ namespace Umbraco.Core.Configuration internal static bool? HasSmtpServer { get; set; } /// - /// Gets the reserved urls from web.config. + /// Gets the reserved URLs from web.config. /// - /// The reserved urls. + /// The reserved URLs. public string ReservedUrls { get @@ -354,10 +354,10 @@ namespace Umbraco.Core.Configuration } /// - /// Gets a value indicating whether umbraco should hide top level nodes from generated urls. + /// Gets a value indicating whether umbraco should hide top level nodes from generated URLs. /// /// - /// true if umbraco hides top level nodes from urls; otherwise, false. + /// true if umbraco hides top level nodes from URLs; otherwise, false. /// public bool HideTopLevelNodeFromPath { diff --git a/src/Umbraco.Core/Configuration/IGlobalSettings.cs b/src/Umbraco.Core/Configuration/IGlobalSettings.cs index ed71e9344c..fd5140042c 100644 --- a/src/Umbraco.Core/Configuration/IGlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/IGlobalSettings.cs @@ -6,9 +6,9 @@ public interface IGlobalSettings { /// - /// Gets the reserved urls from web.config. + /// Gets the reserved URLs from web.config. /// - /// The reserved urls. + /// The reserved URLs. string ReservedUrls { get; } /// @@ -45,10 +45,10 @@ string DefaultUILanguage { get; } /// - /// Gets a value indicating whether umbraco should hide top level nodes from generated urls. + /// Gets a value indicating whether umbraco should hide top level nodes from generated URLs. /// /// - /// true if umbraco hides top level nodes from urls; otherwise, false. + /// true if umbraco hides top level nodes from URLs; otherwise, false. /// bool HideTopLevelNodeFromPath { get; } diff --git a/src/Umbraco.Core/Constants-AppSettings.cs b/src/Umbraco.Core/Constants-AppSettings.cs index 8bf4905726..cb3b0d48d0 100644 --- a/src/Umbraco.Core/Constants-AppSettings.cs +++ b/src/Umbraco.Core/Constants-AppSettings.cs @@ -64,7 +64,7 @@ namespace Umbraco.Core public const string MediaPath = "umbracoMediaPath"; /// - /// The reserved urls from web.config. + /// The reserved URLs from web.config. /// public const string ReservedUrls = "Umbraco.Core.ReservedUrls"; @@ -101,7 +101,7 @@ namespace Umbraco.Core public const string DefaultUILanguage = "Umbraco.Core.DefaultUILanguage"; /// - /// A true/false value indicating whether umbraco should hide top level nodes from generated urls. + /// A true/false value indicating whether umbraco should hide top level nodes from generated URLs. /// public const string HideTopLevelNodeFromPath = "Umbraco.Core.HideTopLevelNodeFromPath"; diff --git a/src/Umbraco.Core/Constants-PropertyEditors.cs b/src/Umbraco.Core/Constants-PropertyEditors.cs index dcd7eb9d05..90f5fbd0d0 100644 --- a/src/Umbraco.Core/Constants-PropertyEditors.cs +++ b/src/Umbraco.Core/Constants-PropertyEditors.cs @@ -192,7 +192,7 @@ namespace Umbraco.Core public const string NestedContent = "Umbraco.NestedContent"; /// - /// Alias for the multi url picker editor. + /// Alias for the multi URL picker editor. /// public const string MultiUrlPicker = "Umbraco.MultiUrlPicker"; } diff --git a/src/Umbraco.Core/GuidUdi.cs b/src/Umbraco.Core/GuidUdi.cs index d78a33a435..93f670cd01 100644 --- a/src/Umbraco.Core/GuidUdi.cs +++ b/src/Umbraco.Core/GuidUdi.cs @@ -34,7 +34,7 @@ namespace Umbraco.Core { Guid guid; if (Guid.TryParse(uriValue.AbsolutePath.TrimStart('/'), out guid) == false) - throw new FormatException("Url \"" + uriValue + "\" is not a guid entity id."); + throw new FormatException("URI \"" + uriValue + "\" is not a GUID entity ID."); Guid = guid; } @@ -48,7 +48,7 @@ namespace Umbraco.Core { var udi = Udi.Parse(s); if (udi is GuidUdi == false) - throw new FormatException("String \"" + s + "\" is not a guid entity id."); + throw new FormatException("String \"" + s + "\" is not a GUID entity id."); return (GuidUdi) udi; } diff --git a/src/Umbraco.Core/IO/IFileSystem.cs b/src/Umbraco.Core/IO/IFileSystem.cs index 0405c5925a..9de1ea40f2 100644 --- a/src/Umbraco.Core/IO/IFileSystem.cs +++ b/src/Umbraco.Core/IO/IFileSystem.cs @@ -102,7 +102,7 @@ namespace Umbraco.Core.IO /// /// Returns the application relative path to the file. /// - /// The full path or url. + /// The full path or URL. /// /// The representing the relative path. /// @@ -118,11 +118,11 @@ namespace Umbraco.Core.IO string GetFullPath(string path); /// - /// Returns the application relative url to the file. + /// Returns the application relative URL to the file. /// - /// The path to return the url for. + /// The path to return the URL for. /// - /// representing the relative url. + /// representing the relative URL. /// string GetUrl(string path); diff --git a/src/Umbraco.Core/IO/PhysicalFileSystem.cs b/src/Umbraco.Core/IO/PhysicalFileSystem.cs index 96aaf7ca27..5a216e8554 100644 --- a/src/Umbraco.Core/IO/PhysicalFileSystem.cs +++ b/src/Umbraco.Core/IO/PhysicalFileSystem.cs @@ -19,7 +19,7 @@ namespace Umbraco.Core.IO // (is used in GetRelativePath) private readonly string _rootPathFwd; - // the relative url, using url separator chars, NOT ending with a separator + // the relative URL, using URL separator chars, NOT ending with a separator // eg "" or "/Views" or "/Media" or "//Media" in case of a virtual path private readonly string _rootUrl; @@ -243,9 +243,9 @@ namespace Umbraco.Core.IO } /// - /// Gets the filesystem-relative path of a full path or of an url. + /// Gets the filesystem-relative path of a full path or of an URL. /// - /// The full path or url. + /// The full path or URL. /// The path, relative to this filesystem's root. /// /// The relative path is relative to this filesystem's root, not starting with any @@ -253,10 +253,10 @@ namespace Umbraco.Core.IO /// public string GetRelativePath(string fullPathOrUrl) { - // test url - var path = fullPathOrUrl.Replace('\\', '/'); // ensure url separator char + // test URL + var path = fullPathOrUrl.Replace('\\', '/'); // ensure URL separator char - // if it starts with the root url, strip it and trim the starting slash to make it relative + // if it starts with the root URL, strip it and trim the starting slash to make it relative // eg "/Media/1234/img.jpg" => "1234/img.jpg" if (IOHelper.PathStartsWith(path, _rootUrl, '/')) return path.Substring(_rootUrl.Length).TrimStart('/'); @@ -319,10 +319,10 @@ namespace Umbraco.Core.IO } /// - /// Gets the url. + /// Gets the URL. /// /// The filesystem-relative path. - /// The url. + /// The URL. /// All separators are forward-slashes. public string GetUrl(string path) { diff --git a/src/Umbraco.Core/IRuntimeState.cs b/src/Umbraco.Core/IRuntimeState.cs index 30c768ab01..9f188b5308 100644 --- a/src/Umbraco.Core/IRuntimeState.cs +++ b/src/Umbraco.Core/IRuntimeState.cs @@ -41,7 +41,7 @@ namespace Umbraco.Core ServerRole ServerRole { get; } /// - /// Gets the Umbraco application url. + /// Gets the Umbraco application URL. /// /// This is eg "http://www.example.com". Uri ApplicationUrl { get; } diff --git a/src/Umbraco.Core/Media/IEmbedProvider.cs b/src/Umbraco.Core/Media/IEmbedProvider.cs index 99b162e0b7..39da6fae0d 100644 --- a/src/Umbraco.Core/Media/IEmbedProvider.cs +++ b/src/Umbraco.Core/Media/IEmbedProvider.cs @@ -15,7 +15,7 @@ namespace Umbraco.Core.Media string[] UrlSchemeRegex { get; } /// - /// A collection of querystring request parameters to append to the API Url + /// A collection of querystring request parameters to append to the API URL /// /// ?key=value&key2=value2 Dictionary RequestParams { get; } diff --git a/src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs b/src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs index 9440000146..f7daf79ec9 100644 --- a/src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs +++ b/src/Umbraco.Core/Models/Entities/IMediaEntitySlim.cs @@ -7,7 +7,7 @@ { /// - /// The media file's path/url + /// The media file's path/URL /// string MediaPath { get; } } diff --git a/src/Umbraco.Core/Models/IRedirectUrl.cs b/src/Umbraco.Core/Models/IRedirectUrl.cs index e066881645..527dad57da 100644 --- a/src/Umbraco.Core/Models/IRedirectUrl.cs +++ b/src/Umbraco.Core/Models/IRedirectUrl.cs @@ -5,7 +5,7 @@ using Umbraco.Core.Models.Entities; namespace Umbraco.Core.Models { /// - /// Represents a redirect url. + /// Represents a redirect URL. /// public interface IRedirectUrl : IEntity, IRememberBeingDirty { @@ -22,7 +22,7 @@ namespace Umbraco.Core.Models Guid ContentKey { get; set; } /// - /// Gets or sets the redirect url creation date. + /// Gets or sets the redirect URL creation date. /// [DataMember] DateTime CreateDateUtc { get; set; } @@ -34,7 +34,7 @@ namespace Umbraco.Core.Models string Culture { get; set; } /// - /// Gets or sets the redirect url route. + /// Gets or sets the redirect URL route. /// /// Is a proper Umbraco route eg /path/to/foo or 123/path/tofoo. [DataMember] diff --git a/src/Umbraco.Core/Models/MediaExtensions.cs b/src/Umbraco.Core/Models/MediaExtensions.cs index 96f183b6e6..c985ace8b0 100644 --- a/src/Umbraco.Core/Models/MediaExtensions.cs +++ b/src/Umbraco.Core/Models/MediaExtensions.cs @@ -9,7 +9,7 @@ namespace Umbraco.Core.Models public static class MediaExtensions { /// - /// Gets the url of a media item. + /// Gets the URL of a media item. /// public static string GetUrl(this IMedia media, string propertyAlias, ILogger logger) { @@ -29,7 +29,7 @@ namespace Umbraco.Core.Models } /// - /// Gets the urls of a media item. + /// Gets the URLs of a media item. /// public static string[] GetUrls(this IMedia media, IContentSection contentSection, ILogger logger) { diff --git a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs index 4e154bf514..23861dfa9d 100644 --- a/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs +++ b/src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs @@ -31,7 +31,7 @@ namespace Umbraco.Core.Models.PublishedContent string Name { get; } /// - /// Gets the url segment of the content item for the current culture. + /// Gets the URL segment of the content item for the current culture. /// string UrlSegment { get; } @@ -93,7 +93,7 @@ namespace Umbraco.Core.Models.PublishedContent DateTime UpdateDate { get; } /// - /// Gets the url of the content item for the current culture. + /// Gets the URL of the content item for the current culture. /// /// /// The value of this property is contextual. It depends on the 'current' request uri, diff --git a/src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs b/src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs index 908b97fc36..58241ade24 100644 --- a/src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs +++ b/src/Umbraco.Core/Models/PublishedContent/PublishedCultureInfos.cs @@ -32,7 +32,7 @@ namespace Umbraco.Core.Models.PublishedContent internal string Name { get; } /// - /// Gets the url segment of the item. + /// Gets the URL segment of the item. /// internal string UrlSegment { get; } diff --git a/src/Umbraco.Core/Models/PublishedContent/UrlMode.cs b/src/Umbraco.Core/Models/PublishedContent/UrlMode.cs index 4cd6a680f4..d11459bb9e 100644 --- a/src/Umbraco.Core/Models/PublishedContent/UrlMode.cs +++ b/src/Umbraco.Core/Models/PublishedContent/UrlMode.cs @@ -1,27 +1,27 @@ namespace Umbraco.Core.Models.PublishedContent { /// - /// Specifies the type of urls that the url provider should produce, Auto is the default. + /// Specifies the type of URLs that the URL provider should produce, Auto is the default. /// public enum UrlMode { /// - /// Indicates that the url provider should do what it has been configured to do. + /// Indicates that the URL provider should do what it has been configured to do. /// Default = 0, /// - /// Indicates that the url provider should produce relative urls exclusively. + /// Indicates that the URL provider should produce relative URLs exclusively. /// Relative, /// - /// Indicates that the url provider should produce absolute urls exclusively. + /// Indicates that the URL provider should produce absolute URLs exclusively. /// Absolute, /// - /// Indicates that the url provider should determine automatically whether to return relative or absolute urls. + /// Indicates that the URL provider should determine automatically whether to return relative or absolute URLs. /// Auto } diff --git a/src/Umbraco.Core/Models/ServerRegistration.cs b/src/Umbraco.Core/Models/ServerRegistration.cs index 7dae5d5393..a862b11c23 100644 --- a/src/Umbraco.Core/Models/ServerRegistration.cs +++ b/src/Umbraco.Core/Models/ServerRegistration.cs @@ -24,7 +24,7 @@ namespace Umbraco.Core.Models /// Initializes a new instance of the class. /// /// The unique id of the server registration. - /// The server url. + /// The server URL. /// The unique server identity. /// The date and time the registration was created. /// The date and time the registration was last accessed. @@ -45,7 +45,7 @@ namespace Umbraco.Core.Models /// /// Initializes a new instance of the class. /// - /// The server url. + /// The server URL. /// The unique server identity. /// The date and time the registration was created. public ServerRegistration(string serverAddress, string serverIdentity, DateTime registered) @@ -58,7 +58,7 @@ namespace Umbraco.Core.Models } /// - /// Gets or sets the server url. + /// Gets or sets the server URL. /// public string ServerAddress { diff --git a/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs b/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs index d05f4e007c..a8a88e54da 100644 --- a/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs @@ -10,72 +10,72 @@ namespace Umbraco.Core.Persistence.Repositories public interface IRedirectUrlRepository : IReadWriteQueryRepository { /// - /// Gets a redirect url. + /// Gets a redirect URL. /// - /// The Umbraco redirect url route. + /// The Umbraco redirect URL route. /// The content unique key. /// The culture. /// IRedirectUrl Get(string url, Guid contentKey, string culture); /// - /// Deletes a redirect url. + /// Deletes a redirect URL. /// - /// The redirect url identifier. + /// The redirect URL identifier. void Delete(Guid id); /// - /// Deletes all redirect urls. + /// Deletes all redirect URLs. /// void DeleteAll(); /// - /// Deletes all redirect urls for a given content. + /// Deletes all redirect URLs for a given content. /// /// The content unique key. void DeleteContentUrls(Guid contentKey); /// - /// Gets the most recent redirect url corresponding to an Umbraco redirect url route. + /// Gets the most recent redirect URL corresponding to an Umbraco redirect URL route. /// - /// The Umbraco redirect url route. - /// The most recent redirect url corresponding to the route. + /// The Umbraco redirect URL route. + /// The most recent redirect URL corresponding to the route. IRedirectUrl GetMostRecentUrl(string url); /// - /// Gets all redirect urls for a content item. + /// Gets all redirect URLs for a content item. /// /// The content unique key. - /// All redirect urls for the content item. + /// All redirect URLs for the content item. IEnumerable GetContentUrls(Guid contentKey); /// - /// Gets all redirect urls. + /// Gets all redirect URLs. /// /// The page index. /// The page size. - /// The total count of redirect urls. - /// The redirect urls. + /// The total count of redirect URLs. + /// The redirect URLs. IEnumerable GetAllUrls(long pageIndex, int pageSize, out long total); /// - /// Gets all redirect urls below a given content item. + /// Gets all redirect URLs below a given content item. /// /// The content unique identifier. /// The page index. /// The page size. - /// The total count of redirect urls. - /// The redirect urls. + /// The total count of redirect URLs. + /// The redirect URLs. IEnumerable GetAllUrls(int rootContentId, long pageIndex, int pageSize, out long total); /// - /// Searches for all redirect urls that contain a given search term in their URL property. + /// Searches for all redirect URLs that contain a given search term in their URL property. /// /// The term to search for. /// The page index. /// The page size. - /// The total count of redirect urls. - /// The redirect urls. + /// The total count of redirect URLs. + /// The redirect URLs. IEnumerable SearchUrls(string searchTerm, long pageIndex, int pageSize, out long total); } } diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs index 242f21c749..00d1105965 100644 --- a/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs +++ b/src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs @@ -186,7 +186,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement const string pattern = ".*[_][0-9]+[x][0-9]+[.].*"; var isResized = Regex.IsMatch(mediaPath, pattern); - // If the image has been resized we strip the "_403x328" of the original "/media/1024/koala_403x328.jpg" url. + // If the image has been resized we strip the "_403x328" of the original "/media/1024/koala_403x328.jpg" URL. if (isResized) { var underscoreIndex = mediaPath.LastIndexOf('_'); diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs index a5e69d9650..2c6ec9b8aa 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs @@ -80,13 +80,13 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters } /// - /// Gets the value image url for a specified crop. + /// Gets the value image URL for a specified crop. /// [Obsolete("Use the overload that takes an IImageUrlGenerator")] public string GetCropUrl(string alias, bool useCropDimensions = true, bool useFocalPoint = false, string cacheBusterValue = null) => GetCropUrl(alias, Current.ImageUrlGenerator, useCropDimensions, useFocalPoint, cacheBusterValue); /// - /// Gets the value image url for a specified crop. + /// Gets the value image URL for a specified crop. /// public string GetCropUrl(string alias, IImageUrlGenerator imageUrlGenerator, bool useCropDimensions = true, bool useFocalPoint = false, string cacheBusterValue = null) { @@ -110,13 +110,13 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters } /// - /// Gets the value image url for a specific width and height. + /// Gets the value image URL for a specific width and height. /// [Obsolete("Use the overload that takes an IImageUrlGenerator")] public string GetCropUrl(int width, int height, bool useFocalPoint = false, string cacheBusterValue = null) => GetCropUrl(width, height, Current.ImageUrlGenerator, useFocalPoint, cacheBusterValue); /// - /// Gets the value image url for a specific width and height. + /// Gets the value image URL for a specific width and height. /// public string GetCropUrl(int width, int height, IImageUrlGenerator imageUrlGenerator, bool useFocalPoint = false, string cacheBusterValue = null) { diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs index 36ffddb863..8926174c03 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValueConverter.cs @@ -42,7 +42,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters } catch (Exception ex) { - // cannot deserialize, assume it may be a raw image url + // cannot deserialize, assume it may be a raw image URL Current.Logger.Error(ex, "Could not deserialize string '{JsonString}' into an image cropper value.", sourceString); value = new ImageCropperValue { Src = sourceString }; } diff --git a/src/Umbraco.Core/PublishedContentExtensions.cs b/src/Umbraco.Core/PublishedContentExtensions.cs index 921883b822..4aa3b77a7b 100644 --- a/src/Umbraco.Core/PublishedContentExtensions.cs +++ b/src/Umbraco.Core/PublishedContentExtensions.cs @@ -61,10 +61,10 @@ namespace Umbraco.Core /// - /// Gets the url segment of the content item. + /// Gets the URL segment of the content item. /// /// The content item. - /// The specific culture to get the url segment for. If null is used the current culture is used (Default is null). + /// The specific culture to get the URL segment for. If null is used the current culture is used (Default is null). public static string UrlSegment(this IPublishedContent content, string culture = null) { // invariant has invariant value (whatever the requested culture) @@ -104,7 +104,7 @@ namespace Umbraco.Core /// /// The content item. /// - /// The specific culture to get the url children for. Default is null which will use the current culture in + /// The specific culture to get the URL children for. Default is null which will use the current culture in /// /// /// Gets children that are available for the specified culture. diff --git a/src/Umbraco.Core/RuntimeState.cs b/src/Umbraco.Core/RuntimeState.cs index 74ec70828b..8a30a97e7b 100644 --- a/src/Umbraco.Core/RuntimeState.cs +++ b/src/Umbraco.Core/RuntimeState.cs @@ -102,7 +102,7 @@ namespace Umbraco.Core // about this is that this is here specifically for the slot swap scenario https://issues.umbraco.org/issue/U4-10626 - // see U4-10626 - in some cases we want to reset the application url + // see U4-10626 - in some cases we want to reset the application URL // (this is a simplified version of what was in 7.x) // note: should this be optional? is it expensive? var url = request == null ? null : ApplicationUrlHelper.GetApplicationUrlFromCurrentRequest(request, _globalSettings); diff --git a/src/Umbraco.Core/Services/IRedirectUrlService.cs b/src/Umbraco.Core/Services/IRedirectUrlService.cs index 3bd9b6f2cf..d509dda1a8 100644 --- a/src/Umbraco.Core/Services/IRedirectUrlService.cs +++ b/src/Umbraco.Core/Services/IRedirectUrlService.cs @@ -10,78 +10,78 @@ namespace Umbraco.Core.Services public interface IRedirectUrlService : IService { /// - /// Registers a redirect url. + /// Registers a redirect URL. /// - /// The Umbraco url route. + /// The Umbraco URL route. /// The content unique key. /// The culture. /// Is a proper Umbraco route eg /path/to/foo or 123/path/tofoo. void Register(string url, Guid contentKey, string culture = null); /// - /// Deletes all redirect urls for a given content. + /// Deletes all redirect URLs for a given content. /// /// The content unique key. void DeleteContentRedirectUrls(Guid contentKey); /// - /// Deletes a redirect url. + /// Deletes a redirect URL. /// - /// The redirect url to delete. + /// The redirect URL to delete. void Delete(IRedirectUrl redirectUrl); /// - /// Deletes a redirect url. + /// Deletes a redirect URL. /// - /// The redirect url identifier. + /// The redirect URL identifier. void Delete(Guid id); /// - /// Deletes all redirect urls. + /// Deletes all redirect URLs. /// void DeleteAll(); /// - /// Gets the most recent redirect urls corresponding to an Umbraco redirect url route. + /// Gets the most recent redirect URLs corresponding to an Umbraco redirect URL route. /// - /// The Umbraco redirect url route. - /// The most recent redirect urls corresponding to the route. + /// The Umbraco redirect URL route. + /// The most recent redirect URLs corresponding to the route. IRedirectUrl GetMostRecentRedirectUrl(string url); /// - /// Gets all redirect urls for a content item. + /// Gets all redirect URLs for a content item. /// /// The content unique key. - /// All redirect urls for the content item. + /// All redirect URLs for the content item. IEnumerable GetContentRedirectUrls(Guid contentKey); /// - /// Gets all redirect urls. + /// Gets all redirect URLs. /// /// The page index. /// The page size. - /// The total count of redirect urls. - /// The redirect urls. + /// The total count of redirect URLs. + /// The redirect URLs. IEnumerable GetAllRedirectUrls(long pageIndex, int pageSize, out long total); /// - /// Gets all redirect urls below a given content item. + /// Gets all redirect URLs below a given content item. /// /// The content unique identifier. /// The page index. /// The page size. - /// The total count of redirect urls. - /// The redirect urls. + /// The total count of redirect URLs. + /// The redirect URLs. IEnumerable GetAllRedirectUrls(int rootContentId, long pageIndex, int pageSize, out long total); /// - /// Searches for all redirect urls that contain a given search term in their URL property. + /// Searches for all redirect URLs that contain a given search term in their URL property. /// /// The term to search for. /// The page index. /// The page size. - /// The total count of redirect urls. - /// The redirect urls. + /// The total count of redirect URLs. + /// The redirect URLs. IEnumerable SearchRedirectUrls(string searchTerm, long pageIndex, int pageSize, out long total); } } diff --git a/src/Umbraco.Core/Services/IServerRegistrationService.cs b/src/Umbraco.Core/Services/IServerRegistrationService.cs index 47bf3838f2..62bb68eb14 100644 --- a/src/Umbraco.Core/Services/IServerRegistrationService.cs +++ b/src/Umbraco.Core/Services/IServerRegistrationService.cs @@ -10,7 +10,7 @@ namespace Umbraco.Core.Services /// /// Touches a server to mark it as active; deactivate stale servers. /// - /// The server url. + /// The server URL. /// The server unique identity. /// The time after which a server is considered stale. void TouchServer(string serverAddress, string serverIdentity, TimeSpan staleTimeout); diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs index 5189b3422e..d751a82dfb 100644 --- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs +++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs @@ -177,7 +177,7 @@ namespace Umbraco.Core.Services.Implement var folderNames = string.Empty; if (dataType.Level != 1) { - //get url encoded folder names + //get URL encoded folder names var folders = _dataTypeService.GetContainers(dataType) .OrderBy(x => x.Level) .Select(x => HttpUtility.UrlEncode(x.Name)); @@ -518,7 +518,7 @@ namespace Umbraco.Core.Services.Implement //don't add folders if this is a child doc type if (contentType.Level != 1 && masterContentType == null) { - //get url encoded folder names + //get URL encoded folder names var folders = _contentTypeService.GetContainers(contentType) .OrderBy(x => x.Level) .Select(x => HttpUtility.UrlEncode(x.Name)); diff --git a/src/Umbraco.Core/Services/Implement/NotificationService.cs b/src/Umbraco.Core/Services/Implement/NotificationService.cs index 2b21945ba8..507da9cec3 100644 --- a/src/Umbraco.Core/Services/Implement/NotificationService.cs +++ b/src/Umbraco.Core/Services/Implement/NotificationService.cs @@ -394,7 +394,7 @@ namespace Umbraco.Core.Services.Implement content.Id.ToString(CultureInfo.InvariantCulture), string.Format("{2}://{0}/{1}", string.Concat(siteUri.Authority), - // TODO: RE-enable this so we can have a nice url + // TODO: RE-enable this so we can have a nice URL /*umbraco.library.NiceUrl(documentObject.Id))*/ string.Concat(content.Id, ".aspx"), protocol), diff --git a/src/Umbraco.Core/Services/Implement/ServerRegistrationService.cs b/src/Umbraco.Core/Services/Implement/ServerRegistrationService.cs index d9ce978274..056d4d9fd9 100644 --- a/src/Umbraco.Core/Services/Implement/ServerRegistrationService.cs +++ b/src/Umbraco.Core/Services/Implement/ServerRegistrationService.cs @@ -40,7 +40,7 @@ namespace Umbraco.Core.Services.Implement /// /// Touches a server to mark it as active; deactivate stale servers. /// - /// The server url. + /// The server URL. /// The server unique identity. /// The time after which a server is considered stale. public void TouchServer(string serverAddress, string serverIdentity, TimeSpan staleTimeout) diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs index c37f8bdf35..57ef9c0d42 100644 --- a/src/Umbraco.Core/StringExtensions.cs +++ b/src/Umbraco.Core/StringExtensions.cs @@ -106,7 +106,7 @@ namespace Umbraco.Core /// internal static Attempt DetectIsJavaScriptPath(this string input) { - //validate that this is a url, if it is not, we'll assume that it is a text block and render it as a text + //validate that this is a URL, if it is not, we'll assume that it is a text block and render it as a text //block instead. var isValid = true; @@ -114,7 +114,7 @@ namespace Umbraco.Core { //ok it validates, but so does alert('hello'); ! so we need to do more checks - //here are the valid chars in a url without escaping + //here are the valid chars in a URL without escaping if (Regex.IsMatch(input, @"[^a-zA-Z0-9-._~:/?#\[\]@!$&'\(\)*\+,%;=]")) isValid = false; @@ -856,7 +856,7 @@ namespace Umbraco.Core var pos = str.IndexOf('='); if (pos < 0) pos = str.Length; - // replace chars that would cause problems in urls + // replace chars that would cause problems in URLs var chArray = new char[pos]; for (var i = 0; i < pos; i++) { @@ -1095,13 +1095,13 @@ namespace Umbraco.Core return Current.ShortStringHelper.CleanStringForSafeAlias(alias, culture); } - // the new methods to get a url segment + // the new methods to get a URL segment /// - /// Cleans a string to produce a string that can safely be used in an url segment. + /// Cleans a string to produce a string that can safely be used in an URL segment. /// /// The text to filter. - /// The safe url segment. + /// The safe URL segment. public static string ToUrlSegment(this string text) { if (text == null) throw new ArgumentNullException(nameof(text)); @@ -1111,11 +1111,11 @@ namespace Umbraco.Core } /// - /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an url segment. + /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an URL segment. /// /// The text to filter. /// The culture. - /// The safe url segment. + /// The safe URL segment. public static string ToUrlSegment(this string text, string culture) { if (text == null) throw new ArgumentNullException(nameof(text)); @@ -1124,7 +1124,7 @@ namespace Umbraco.Core return Current.ShortStringHelper.CleanStringForUrlSegment(text, culture); } - // the new methods to clean a string (to alias, url segment...) + // the new methods to clean a string (to alias, URL segment...) /// /// Cleans a string. @@ -1205,7 +1205,7 @@ namespace Umbraco.Core /// /// Cleans a string, in the context of the invariant culture, to produce a string that can safely be used as a filename, - /// both internally (on disk) and externally (as a url). + /// both internally (on disk) and externally (as a URL). /// /// The text to filter. /// The safe filename. @@ -1216,7 +1216,7 @@ namespace Umbraco.Core /// /// Cleans a string, in the context of the invariant culture, to produce a string that can safely be used as a filename, - /// both internally (on disk) and externally (as a url). + /// both internally (on disk) and externally (as a URL). /// /// The text to filter. /// The culture. diff --git a/src/Umbraco.Core/Strings/ContentBaseExtensions.cs b/src/Umbraco.Core/Strings/ContentBaseExtensions.cs index 43e3506a84..01560f3b8a 100644 --- a/src/Umbraco.Core/Strings/ContentBaseExtensions.cs +++ b/src/Umbraco.Core/Strings/ContentBaseExtensions.cs @@ -6,17 +6,17 @@ using Umbraco.Core.Models; namespace Umbraco.Core.Strings { /// - /// Provides extension methods to IContentBase to get url segments. + /// Provides extension methods to IContentBase to get URL segments. /// internal static class ContentBaseExtensions { /// - /// Gets the url segment for a specified content and culture. + /// Gets the URL segment for a specified content and culture. /// /// The content. /// The culture. /// - /// The url segment. + /// The URL segment. public static string GetUrlSegment(this IContentBase content, IEnumerable urlSegmentProviders, string culture = null) { if (content == null) throw new ArgumentNullException(nameof(content)); diff --git a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs index 6361186604..15a87717d2 100644 --- a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs +++ b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs @@ -8,7 +8,7 @@ using Umbraco.Core.Configuration.UmbracoSettings; namespace Umbraco.Core.Strings { /// - /// New default implementation of string functions for short strings such as aliases or url segments. + /// New default implementation of string functions for short strings such as aliases or URL segments. /// /// /// Not optimized to work on large bodies of text. @@ -92,10 +92,10 @@ namespace Umbraco.Core.Strings } /// - /// Cleans a string to produce a string that can safely be used in an url segment. + /// Cleans a string to produce a string that can safely be used in an URL segment. /// /// The text to filter. - /// The safe url segment. + /// The safe URL segment. /// /// The string will be cleaned in the context of the default culture. /// Url segments are Ascii only (no accents...). @@ -106,11 +106,11 @@ namespace Umbraco.Core.Strings } /// - /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an url segment. + /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an URL segment. /// /// The text to filter. /// The culture. - /// The safe url segment. + /// The safe URL segment. /// /// Url segments are Ascii only (no accents...). /// @@ -121,7 +121,7 @@ namespace Umbraco.Core.Strings /// /// Cleans a string, in the context of the default culture, to produce a string that can safely be used as a filename, - /// both internally (on disk) and externally (as a url). + /// both internally (on disk) and externally (as a URL). /// /// The text to filter. /// The safe filename. @@ -133,7 +133,7 @@ namespace Umbraco.Core.Strings /// /// Cleans a string to produce a string that can safely be used as a filename, - /// both internally (on disk) and externally (as a url). + /// both internally (on disk) and externally (as a URL). /// /// The text to filter. /// The culture. diff --git a/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs b/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs index 9472ff4823..a0f8c73548 100644 --- a/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs +++ b/src/Umbraco.Core/Strings/DefaultUrlSegmentProvider.cs @@ -8,11 +8,11 @@ namespace Umbraco.Core.Strings public class DefaultUrlSegmentProvider : IUrlSegmentProvider { /// - /// Gets the url segment for a specified content and culture. + /// Gets the URL segment for a specified content and culture. /// /// The content. /// The culture. - /// The url segment. + /// The URL segment. public string GetUrlSegment(IContentBase content, string culture = null) { return GetUrlSegmentSource(content, culture).ToUrlSegment(culture); diff --git a/src/Umbraco.Core/Strings/IShortStringHelper.cs b/src/Umbraco.Core/Strings/IShortStringHelper.cs index fecbeaaee9..37873caded 100644 --- a/src/Umbraco.Core/Strings/IShortStringHelper.cs +++ b/src/Umbraco.Core/Strings/IShortStringHelper.cs @@ -1,7 +1,7 @@ namespace Umbraco.Core.Strings { /// - /// Provides string functions for short strings such as aliases or url segments. + /// Provides string functions for short strings such as aliases or URL segments. /// /// Not necessarily optimized to work on large bodies of text. public interface IShortStringHelper @@ -26,24 +26,24 @@ string CleanStringForSafeAlias(string text, string culture); /// - /// Cleans a string to produce a string that can safely be used in an url segment. + /// Cleans a string to produce a string that can safely be used in an URL segment. /// /// The text to filter. - /// The safe url segment. + /// The safe URL segment. /// The string will be cleaned in the context of the IShortStringHelper default culture. string CleanStringForUrlSegment(string text); /// - /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an url segment. + /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used in an URL segment. /// /// The text to filter. /// The culture. - /// The safe url segment. + /// The safe URL segment. string CleanStringForUrlSegment(string text, string culture); /// /// Cleans a string, in the context of the invariant culture, to produce a string that can safely be used as a filename, - /// both internally (on disk) and externally (as a url). + /// both internally (on disk) and externally (as a URL). /// /// The text to filter. /// The safe filename. @@ -52,7 +52,7 @@ /// /// Cleans a string, in the context of a specified culture, to produce a string that can safely be used as a filename, - /// both internally (on disk) and externally (as a url). + /// both internally (on disk) and externally (as a URL). /// /// The text to filter. /// The culture. diff --git a/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs b/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs index 12d2ef9a17..fddb87e716 100644 --- a/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs +++ b/src/Umbraco.Core/Strings/IUrlSegmentProvider.cs @@ -4,20 +4,20 @@ using Umbraco.Core.Models; namespace Umbraco.Core.Strings { /// - /// Provides url segments for content. + /// Provides URL segments for content. /// /// Url segments should comply with IETF RFCs regarding content, encoding, etc. public interface IUrlSegmentProvider { /// - /// Gets the url segment for a specified content and culture. + /// Gets the URL segment for a specified content and culture. /// /// The content. /// The culture. - /// The url segment. - /// This is for when Umbraco is capable of managing more than one url + /// The URL segment. + /// This is for when Umbraco is capable of managing more than one URL /// per content, in 1-to-1 multilingual configurations. Then there would be one - /// url per culture. + /// URL per culture. string GetUrlSegment(IContentBase content, string culture = null); // TODO: For the 301 tracking, we need to add another extended interface to this so that diff --git a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs index 2a558f85aa..95b08c8377 100644 --- a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs +++ b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs @@ -9,7 +9,7 @@ using Umbraco.Core.Logging; namespace Umbraco.Core.Sync { /// - /// A helper used to determine the current server umbraco application url. + /// A helper used to determine the current server umbraco application URL. /// public static class ApplicationUrlHelper { @@ -17,12 +17,12 @@ namespace Umbraco.Core.Sync private static readonly Type TypeOfApplicationUrlHelper = typeof(ApplicationUrlHelper); /// - /// Gets or sets a custom provider for the umbraco application url. + /// Gets or sets a custom provider for the umbraco application URL. /// /// /// Receives the current request as a parameter, and it may be null. Must return a properly - /// formatted url with scheme and umbraco dir and no trailing slash eg "http://www.mysite.com/umbraco", - /// or null. To be used in auto-load-balancing scenarios where the application url is not + /// formatted URL with scheme and umbraco dir and no trailing slash eg "http://www.mysite.com/umbraco", + /// or null. To be used in auto-load-balancing scenarios where the application URL is not /// in config files but is determined programmatically. /// Must be assigned before resolution is frozen. /// @@ -67,7 +67,7 @@ namespace Umbraco.Core.Sync } // try the server registrar - // which is assumed to return a url that: + // which is assumed to return a URL that: // - end with SystemDirectories.Umbraco // - contain a scheme // - end or not with a slash, it will be taken care of diff --git a/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs b/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs index 276ce6097c..a4315c33e9 100644 --- a/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs +++ b/src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs @@ -46,11 +46,11 @@ namespace Umbraco.Core.Sync } /// - /// Gets the current umbraco application url. + /// Gets the current umbraco application URL. /// public string GetCurrentServerUmbracoApplicationUrl() { - // this registrar does not provide the umbraco application url + // this registrar does not provide the umbraco application URL return null; } diff --git a/src/Umbraco.Core/Sync/IServerRegistrar.cs b/src/Umbraco.Core/Sync/IServerRegistrar.cs index a4edb1d0e9..8bc8021eec 100644 --- a/src/Umbraco.Core/Sync/IServerRegistrar.cs +++ b/src/Umbraco.Core/Sync/IServerRegistrar.cs @@ -18,11 +18,11 @@ namespace Umbraco.Core.Sync ServerRole GetCurrentServerRole(); /// - /// Gets the current umbraco application url. + /// Gets the current umbraco application URL. /// /// - /// If the registrar does not provide the umbraco application url, should return null. - /// Must return null, or a url that ends with SystemDirectories.Umbraco, and contains a scheme, eg "http://www.mysite.com/umbraco". + /// If the registrar does not provide the umbraco application URL, should return null. + /// Must return null, or a URL that ends with SystemDirectories.Umbraco, and contains a scheme, eg "http://www.mysite.com/umbraco". /// string GetCurrentServerUmbracoApplicationUrl(); } diff --git a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs index 7434131dc2..a475e4e1c3 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs +++ b/src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComponent.cs @@ -58,7 +58,7 @@ namespace Umbraco.ModelsBuilder.Embedded.Compose private void InstallServerVars() { - // register our url - for the backoffice api + // register our URL - for the backoffice API ServerVariablesParser.Parsing += ServerVariablesParser_Parsing; } diff --git a/src/Umbraco.TestData/UmbracoTestDataController.cs b/src/Umbraco.TestData/UmbracoTestDataController.cs index 02949d5345..f55ced0dbc 100644 --- a/src/Umbraco.TestData/UmbracoTestDataController.cs +++ b/src/Umbraco.TestData/UmbracoTestDataController.cs @@ -172,7 +172,7 @@ namespace Umbraco.TestData { var imageUrl = faker.Image.PicsumUrl(); - // we are appending a &ext=.jpg to the end of this for a reason. The result of this url will be something like: + // we are appending a &ext=.jpg to the end of this for a reason. The result of this URL will be something like: // https://picsum.photos/640/480/?image=106 // and due to the way that we detect images there must be an extension so we'll change it to // https://picsum.photos/640/480/?image=106&ext=.jpg diff --git a/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs b/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs index 343994b03a..43a120d154 100644 --- a/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs +++ b/src/Umbraco.Tests/IO/ShadowFileSystemTests.cs @@ -887,12 +887,12 @@ namespace Umbraco.Tests.IO } /// - /// Ensure the url returned contains the path relative to the FS root, + /// Ensure the URL returned contains the path relative to the FS root, /// but including the rootUrl the FS was initialized with. /// /// /// This file stuff in this test is kinda irrelevant with the current implementation. - /// We do tests that the files are written to the correct places and the url is returned correct, + /// We do tests that the files are written to the correct places and the URL is returned correct, /// but GetUrl is currently really just string manipulation so files are not actually hit by the code. /// Leaving the file stuff in here for now in case the method becomes more clever at some point. /// diff --git a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs index 48f0e7b27e..893a170f5a 100644 --- a/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs +++ b/src/Umbraco.Tests/LegacyXmlPublishedCache/PublishedContentCache.cs @@ -96,7 +96,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache // so we have a route that maps to a content... say "1234/path/to/content" - however, there could be a // domain set on "to" and route "4567/content" would also map to the same content - and due to how - // urls computing work (by walking the tree up to the first domain we find) it is that second route + // URLs computing work (by walking the tree up to the first domain we find) it is that second route // that would be returned - the "deepest" route - and that is the route we want to cache, *not* the // longer one - so make sure we don't cache the wrong route @@ -257,7 +257,7 @@ namespace Umbraco.Tests.LegacyXmlPublishedCache if (node == null) return null; // walk up from that node until we hit a node with a domain, - // or we reach the content root, collecting urls in the way + // or we reach the content root, collecting URLs in the way var pathParts = new List(); var n = node; var hasDomains = _domainCache.HasAssigned(n.Id); diff --git a/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs b/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs index 79878a59a1..163effb676 100644 --- a/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs +++ b/src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs @@ -77,7 +77,7 @@ namespace Umbraco.Tests.Misc [Test] public void SetApplicationUrlWhenNoSettings() { - // no applicable settings, cannot set url + // no applicable settings, cannot set URL var settings = Mock.Of(section => section.WebRouting == Mock.Of(wrSection => wrSection.UmbracoApplicationUrl == (string) null)); diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs index 85168e4490..18bb6bdfb5 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlTests.cs @@ -24,7 +24,7 @@ namespace Umbraco.Tests.Routing [TestCase("/home/sub1", -1)] // should fail // these two are special. getNiceUrl(1046) returns "/" but getNiceUrl(1172) cannot also return "/" so - // we've made it return "/test-page" => we have to support that url back in the lookup... + // we've made it return "/test-page" => we have to support that URL back in the lookup... [TestCase("/home", 1046)] [TestCase("/test-page", 1172)] public void Match_Document_By_Url_Hide_Top_Level(string urlString, int expectedId) diff --git a/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs b/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs index ac2e62b1ef..18eafe508e 100644 --- a/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs +++ b/src/Umbraco.Tests/Routing/ContentFinderByUrlWithDomainsTests.cs @@ -134,7 +134,7 @@ namespace Umbraco.Tests.Routing var publishedRouter = CreatePublishedRouter(Factory); var frequest = publishedRouter.CreateRequest(umbracoContext); - // must lookup domain else lookup by url fails + // must lookup domain else lookup by URL fails publishedRouter.FindDomain(frequest); var lookup = new ContentFinderByUrl(Logger); @@ -176,7 +176,7 @@ namespace Umbraco.Tests.Routing var publishedRouter = CreatePublishedRouter(Factory); var frequest = publishedRouter.CreateRequest(umbracoContext); - // must lookup domain else lookup by url fails + // must lookup domain else lookup by URL fails publishedRouter.FindDomain(frequest); Assert.AreEqual(expectedCulture, frequest.Culture.Name); diff --git a/src/Umbraco.Tests/Routing/RouteTestExtensions.cs b/src/Umbraco.Tests/Routing/RouteTestExtensions.cs index fae8e2a6fa..642488c256 100644 --- a/src/Umbraco.Tests/Routing/RouteTestExtensions.cs +++ b/src/Umbraco.Tests/Routing/RouteTestExtensions.cs @@ -9,7 +9,7 @@ namespace Umbraco.Tests.Routing { /// - /// Return the route data for the url based on a mocked context + /// Return the route data for the URL based on a mocked context /// /// /// @@ -21,7 +21,7 @@ namespace Umbraco.Tests.Routing } /// - /// Get the route data based on the url and http context + /// Get the route data based on the URL and HTTP context /// /// /// diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs index e95fdfc87c..94660d40cf 100644 --- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs +++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs @@ -100,7 +100,7 @@ namespace Umbraco.Tests.Routing [Test] public void Is_Client_Side_Request_InvalidPath_ReturnFalse() { - //This url is invalid. Default to false when the extension cannot be determined + //This URL is invalid. Default to false when the extension cannot be determined var uri = new Uri("http://test.com/installing-modules+foobar+\"yipee\""); var result = uri.IsClientSideRequest(); Assert.AreEqual(false, result); diff --git a/src/Umbraco.Tests/Routing/UrlProviderTests.cs b/src/Umbraco.Tests/Routing/UrlProviderTests.cs index 8043e25661..d61517b41e 100644 --- a/src/Umbraco.Tests/Routing/UrlProviderTests.cs +++ b/src/Umbraco.Tests/Routing/UrlProviderTests.cs @@ -184,7 +184,7 @@ namespace Umbraco.Tests.Routing globalSettings: globalSettings.Object, snapshotService: snapshotService.Object); - //even though we are asking for a specific culture URL, there are no domains assigned so all that can be returned is a normal relative url. + //even though we are asking for a specific culture URL, there are no domains assigned so all that can be returned is a normal relative URL. var url = umbracoContext.UrlProvider.GetUrl(1234, culture: "fr-FR"); Assert.AreEqual("/home/test-fr/", url); diff --git a/src/Umbraco.Tests/Routing/UrlRoutesTests.cs b/src/Umbraco.Tests/Routing/UrlRoutesTests.cs index 4b8d708df6..724a263b54 100644 --- a/src/Umbraco.Tests/Routing/UrlRoutesTests.cs +++ b/src/Umbraco.Tests/Routing/UrlRoutesTests.cs @@ -12,7 +12,7 @@ using Umbraco.Tests.Testing; namespace Umbraco.Tests.Routing { // purpose: test the values returned by PublishedContentCache.GetRouteById - // and .GetByRoute (no caching at all, just routing nice urls) including all + // and .GetByRoute (no caching at all, just routing nice URLs) including all // the quirks due to hideTopLevelFromPath and backward compatibility. [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerFixture)] @@ -146,7 +146,7 @@ DetermineRouteById(id): node = node(id) - walk up from node to domain or root, assemble parts = url segments + walk up from node to domain or root, assemble parts = URL segments if !domain and global.hide: if id.parent: diff --git a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs index 6587b2e4f6..363f87395d 100644 --- a/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs +++ b/src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs @@ -16,7 +16,7 @@ namespace Umbraco.Tests.Routing [TestFixture] public class UrlsWithNestedDomains : UrlRoutingTestBase { - // in the case of nested domains more than 1 url may resolve to a document + // in the case of nested domains more than 1 URL may resolve to a document // but only one route can be cached - the 'canonical' route ie the route // using the closest domain to the node - here we test that if we request // a non-canonical route, it is not cached / the cache is not polluted @@ -40,7 +40,7 @@ namespace Umbraco.Tests.Routing const string url = "http://domain1.com/1001-1/1001-1-1"; - // get the nice url for 100111 + // get the nice URL for 100111 var umbracoContext = GetUmbracoContext(url, 9999, umbracoSettings: settings, urlProviders: new [] { new DefaultUrlProvider(settings.RequestHandler, Logger, globalSettings.Object, new SiteDomainHelper()) @@ -53,7 +53,7 @@ namespace Umbraco.Tests.Routing var cachedRoutes = cache.RoutesCache.GetCachedRoutes(); Assert.AreEqual("10011/1001-1-1", cachedRoutes[100111]); - // route a rogue url + // route a rogue URL var publishedRouter = CreatePublishedRouter(); var frequest = publishedRouter.CreateRequest(umbracoContext); @@ -71,7 +71,7 @@ namespace Umbraco.Tests.Routing Assert.AreEqual("10011/1001-1-1", cachedRoutes[100111]); // no //Assert.AreEqual("1001/1001-1/1001-1-1", cachedRoutes[100111]); // yes - // what's the nice url now? + // what's the nice URL now? Assert.AreEqual("http://domain2.com/1001-1-1/", umbracoContext.UrlProvider.GetUrl(100111)); // good //Assert.AreEqual("http://domain1.com/1001-1/1001-1-1", routingContext.NiceUrlProvider.GetNiceUrl(100111, true)); // bad } diff --git a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs index 9157a76773..93b4dd0766 100644 --- a/src/Umbraco.Tests/Runtimes/StandaloneTests.cs +++ b/src/Umbraco.Tests/Runtimes/StandaloneTests.cs @@ -201,7 +201,7 @@ namespace Umbraco.Tests.Runtimes Assert.AreEqual("test", pcontent.Name()); Assert.IsTrue(pcontent.IsDraft()); - // no published url + // no published URL Assert.AreEqual("#", pcontent.Url()); // now publish the document + make some unpublished changes @@ -215,7 +215,7 @@ namespace Umbraco.Tests.Runtimes Assert.AreEqual("test", pcontent.Name()); Assert.IsFalse(pcontent.IsDraft()); - // but the url is the published one - no draft url + // but the URL is the published one - no draft URL Assert.AreEqual("/test/", pcontent.Url()); // and also an updated draft document @@ -224,7 +224,7 @@ namespace Umbraco.Tests.Runtimes Assert.AreEqual("testx", pcontent.Name()); Assert.IsTrue(pcontent.IsDraft()); - // and the published document has a url + // and the published document has a URL Assert.AreEqual("/test/", pcontent.Url()); umbracoContextReference.Dispose(); diff --git a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs index 5fd5710a79..b93d79dcf0 100644 --- a/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs +++ b/src/Umbraco.Tests/Strings/DefaultShortStringHelperTests.cs @@ -338,7 +338,7 @@ namespace Umbraco.Tests.Strings Assert.AreEqual("house*2", helper.CleanString("house (2)", CleanStringType.Alias)); // FIXME: but for a filename we want to keep them! - // FIXME: and what about a url? + // FIXME: and what about a URL? } [Test] @@ -424,7 +424,7 @@ namespace Umbraco.Tests.Strings // lower-cased, utf8 filename, removing illegal filename chars, using dash-separator Assert.AreEqual("0123-中文测试-中文测试-léger-zôrg-2-a-x", filename, "filename"); - // lower-cased, utf8 url segment, only letters and digits, using dash-separator + // lower-cased, utf8 URL segment, only letters and digits, using dash-separator Assert.AreEqual("0123-中文测试-中文测试-léger-zôrg-2-a-x", segment, "segment"); } diff --git a/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs b/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs index 6c40e2842d..59968024d1 100644 --- a/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs +++ b/src/Umbraco.Tests/Templates/HtmlImageSourceParserTests.cs @@ -63,7 +63,7 @@ namespace Umbraco.Tests.Templates [Test] public void Ensure_Image_Sources() { - //setup a mock url provider which we'll use for testing + //setup a mock URL provider which we'll use for testing var mediaType = new PublishedContentType(Guid.NewGuid(), 777, "image", PublishedItemType.Media, Enumerable.Empty(), Enumerable.Empty(), ContentVariation.Nothing); var media = new Mock(); diff --git a/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs b/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs index 861a7e4db6..f9f82fd31b 100644 --- a/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs +++ b/src/Umbraco.Tests/Templates/HtmlLocalLinkParserTests.cs @@ -49,7 +49,7 @@ namespace Umbraco.Tests.Templates [TestCase("hello href=\"{localLink:umb://document-type/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ", "hello href=\"#\" world ")] public void ParseLocalLinks(string input, string result) { - //setup a mock url provider which we'll use for testing + //setup a mock URL provider which we'll use for testing var contentUrlProvider = new Mock(); contentUrlProvider .Setup(x => x.GetUrl(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny())) diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs index 0840d8a18c..cc1cfa6a1d 100644 --- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs +++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs @@ -81,7 +81,7 @@ namespace Umbraco.Tests.TestHelpers /// /// /// An event messages factory. - /// Some url segment providers. + /// Some URL segment providers. /// /// A container. /// diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cy.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cy.js index d2fdd077f5..2863840abb 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cy.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/cy.js @@ -121,7 +121,7 @@ tinymce.addI18n('cy',{ "Date\/time": "Dyddiad\/amser", "Insert date\/time": "Mewnosod dyddiad\/amser", "Remove link": "Tynnu dolen", -"Url": "Url", +"Url": "URL", "Text to display": "Testun i'w ddangos", "Anchors": "Angorau", "Insert link": "Mewnosod dolen", @@ -227,4 +227,4 @@ tinymce.addI18n('cy',{ "View": "Dangos", "Table": "Tabl", "Format": "Fformat" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/da.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/da.js index 90e4009d92..a50f2f10ec 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/da.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/da.js @@ -150,7 +150,7 @@ tinymce.addI18n('da',{ "Insert link": "Inds\u00e6t link", "Insert\/edit link": "Inds\u00e6t\/ret link", "Text to display": "Vis tekst", -"Url": "Url", +"Url": "URL", "Target": "Target", "None": "Ingen", "New window": "Nyt vindue", @@ -258,4 +258,4 @@ tinymce.addI18n('da',{ "Tools": "V\u00e6rkt\u00f8j", "Powered by {0}": "Drevet af {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text omr\u00e5de. Tryk ALT-F9 for menu. Tryk ALT-F10 for toolbar. Tryk ALT-0 for hj\u00e6lp" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de_AT.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de_AT.js index 2af071f5ce..0073810c1a 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de_AT.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/de_AT.js @@ -150,7 +150,7 @@ tinymce.addI18n('de_AT',{ "Insert link": "Link einf\u00fcgen", "Insert\/edit link": "Link einf\u00fcgen\/bearbeiten", "Text to display": "Angezeigter Text", -"Url": "Url", +"Url": "URL", "Target": "Ziel", "None": "Keine", "New window": "Neues Fenster", @@ -258,4 +258,4 @@ tinymce.addI18n('de_AT',{ "Tools": "Extras", "Powered by {0}": "Betrieben von {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Dr\u00fccken Sie ALT-F9 f\u00fcr das Men\u00fc. Dr\u00fccken Sie ALT-F10 f\u00fcr die Werkzeugleiste. Dr\u00fccken Sie ALT-0 f\u00fcr Hilfe" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_CA.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_CA.js index f32de01724..cc07ffd23e 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_CA.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_CA.js @@ -150,7 +150,7 @@ tinymce.addI18n('en_CA',{ "Insert link": "Insert link", "Insert\/edit link": "Insert\/edit link", "Text to display": "Text to display", -"Url": "Url", +"Url": "URL", "Target": "Target", "None": "None", "New window": "New window", @@ -258,4 +258,4 @@ tinymce.addI18n('en_CA',{ "Tools": "Tools", "Powered by {0}": "Powered by {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_US.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_US.js index 90eae85800..0b50212fd9 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_US.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/en_US.js @@ -150,7 +150,7 @@ tinymce.addI18n('en_US',{ "Insert link": "Insert link", "Insert\/edit link": "Insert\/edit link", "Text to display": "Text to display", -"Url": "Url", +"Url": "URL", "Target": "Target", "None": "None", "New window": "New window", @@ -258,4 +258,4 @@ tinymce.addI18n('en_US',{ "Tools": "Tools", "Powered by {0}": "Powered by {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es_MX.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es_MX.js index b0f2019ffe..688f14ba51 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es_MX.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/es_MX.js @@ -150,7 +150,7 @@ tinymce.addI18n('es_MX',{ "Insert link": "Insertar enlace", "Insert\/edit link": "Inserta\/editar enlace", "Text to display": "Texto a mostrar", -"Url": "Url", +"Url": "URL", "Target": "Objetivo", "None": "Ninguno", "New window": "Nueva ventana", @@ -258,4 +258,4 @@ tinymce.addI18n('es_MX',{ "Tools": "Herramientas", "Powered by {0}": "Creado con {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Presione dentro del \u00e1rea de texto ALT-F9 para invocar el men\u00fa, ALT-F10 para la barra de herramientas y ALT-0 para la ayuda." -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/et.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/et.js index c6beeeb510..96b763506c 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/et.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/et.js @@ -150,7 +150,7 @@ tinymce.addI18n('et',{ "Insert link": "Lisa link", "Insert\/edit link": "Lisa\/muuda link", "Text to display": "Kuvatav tekst", -"Url": "Viide (url)", +"Url": "Viide (URL)", "Target": "Sihtm\u00e4rk", "None": "Puudub", "New window": "Uus aken", @@ -258,4 +258,4 @@ tinymce.addI18n('et',{ "Tools": "T\u00f6\u00f6riistad", "Powered by {0}": "Kasutatud tarkvara {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rikastatud teksti ala. Men\u00fc\u00fc jaoks vajuta ALT-F9. T\u00f6\u00f6riistariba jaoks vajuta ALT-F10. Abi saamiseks vajuta ALT-0." -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/eu.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/eu.js index c4374394d4..44e62db3f8 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/eu.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/eu.js @@ -150,7 +150,7 @@ tinymce.addI18n('eu',{ "Insert link": "Esteka txertatu", "Insert\/edit link": "Esteka txertatu\/editatu", "Text to display": "Bistaratzeko testua", -"Url": "Url", +"Url": "URL", "Target": "Target", "None": "Bat ere ez", "New window": "Lehio berria", @@ -258,4 +258,4 @@ tinymce.addI18n('eu',{ "Tools": "Tresnak", "Powered by {0}": "{0}rekin egina", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Testu aberastuko area. Sakatu ALT-F9 menurako. Sakatu ALT-F10 tresna-barrarako. Sakatu ALT-0 laguntzarako" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr.js index 2d074f8c6e..d61015efa0 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr.js @@ -150,7 +150,7 @@ tinymce.addI18n('fr_FR',{ "Insert\/Edit Link": "Ins\u00e9rer\/Modifier lien", "Insert\/edit link": "Ins\u00e9rer\/modifier un lien", "Text to display": "Texte \u00e0 afficher", -"Url": "Url", +"Url": "URL", "Open link in...": "Ouvrir le lien dans...", "Current window": "Fen\u00eatre active", "None": "n\/a", @@ -386,4 +386,4 @@ tinymce.addI18n('fr_FR',{ "Spellcheck": "V\u00e9rification orthographique", "Caption": "Titre", "Insert template": "Ajouter un th\u00e8me" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr_FR.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr_FR.js index 5c37164b2c..5ed177c9fc 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr_FR.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/fr_FR.js @@ -150,7 +150,7 @@ tinymce.addI18n('fr_FR',{ "Insert link": "Ins\u00e9rer un lien", "Insert\/edit link": "Ins\u00e9rer\/modifier un lien", "Text to display": "Texte \u00e0 afficher", -"Url": "Url", +"Url": "URL", "Target": "Cible", "None": "n\/a", "New window": "Nouvelle fen\u00eatre", @@ -258,4 +258,4 @@ tinymce.addI18n('fr_FR',{ "Tools": "Outils", "Powered by {0}": "Propuls\u00e9 par {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zone Texte Riche. Appuyer sur ALT-F9 pour le menu. Appuyer sur ALT-F10 pour la barre d'outils. Appuyer sur ALT-0 pour de l'aide." -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hr.js index d52f861ce9..617e1f4823 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hr.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hr.js @@ -144,7 +144,7 @@ tinymce.addI18n('hr',{ "Insert link": "Umetni poveznicu", "Insert\/edit link": "Umetni\/izmijeni poveznicu", "Text to display": "Tekst za prikaz", -"Url": "Url", +"Url": "URL", "Target": "Meta", "None": "Ni\u0161ta", "New window": "Novi prozor", @@ -250,4 +250,4 @@ tinymce.addI18n('hr',{ "Table": "Tablica", "Tools": "Alati", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Pritisni ALT-F9 za izbornik. Pritisni ALT-F10 za alatnu traku. Pritisni ALT-0 za pomo\u0107" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hu_HU.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hu_HU.js index 3972dc2b3c..13bb4984a9 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hu_HU.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/hu_HU.js @@ -150,7 +150,7 @@ tinymce.addI18n('hu_HU',{ "Insert link": "Hivatkoz\u00e1s beilleszt\u00e9se", "Insert\/edit link": "Hivatkoz\u00e1s beilleszt\u00e9se\/szerkeszt\u00e9se", "Text to display": "Megjelen\u0151 sz\u00f6veg", -"Url": "Url", +"Url": "URL", "Target": "C\u00e9l", "None": "Nincs", "New window": "\u00daj ablak", @@ -258,4 +258,4 @@ tinymce.addI18n('hu_HU',{ "Tools": "Eszk\u00f6z\u00f6k", "Powered by {0}": "\u00dczemelteti: {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text ter\u00fclet. Nyomj ALT-F9-et a men\u00fch\u00f6z. Nyomj ALT-F10-et az eszk\u00f6zt\u00e1rhoz. Nyomj ALT-0-t a s\u00fag\u00f3hoz" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/it.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/it.js index 5ffc0c0f80..a97118da21 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/it.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/it.js @@ -150,7 +150,7 @@ tinymce.addI18n('it',{ "Insert link": "Inserisci il Link", "Insert\/edit link": "Inserisci\/Modifica Link", "Text to display": "Testo da Visualizzare", -"Url": "Url", +"Url": "URL", "Target": "Target", "None": "No", "New window": "Nuova Finestra", @@ -258,4 +258,4 @@ tinymce.addI18n('it',{ "Tools": "Strumenti", "Powered by {0}": "Fornito da {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Premi ALT-F9 per il men\u00f9. Premi ALT-F10 per la barra degli strumenti. Premi ALT-0 per l'aiuto." -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ka_GE.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ka_GE.js index 9bffb8040d..805a966489 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ka_GE.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ka_GE.js @@ -121,7 +121,7 @@ tinymce.addI18n('ka_GE',{ "Date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd", "Insert date\/time": "\u10d7\u10d0\u10e0\u10d8\u10e6\u10d8\/\u10d3\u10e0\u10dd\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0", "Remove link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10ec\u10d0\u10e8\u10da\u10d0", -"Url": "Url", +"Url": "URL", "Text to display": "\u10e2\u10d4\u10e5\u10e1\u10e2\u10d8", "Anchors": "\u10e6\u10e3\u10d6\u10d0", "Insert link": "\u10d1\u10db\u10e3\u10da\u10d8\u10e1 \u10e9\u10d0\u10e1\u10db\u10d0", @@ -227,4 +227,4 @@ tinymce.addI18n('ka_GE',{ "View": "\u10dc\u10d0\u10ee\u10d5\u10d0", "Table": "\u10ea\u10ee\u10e0\u10d8\u10da\u10d8", "Format": "\u10e4\u10dd\u10e0\u10db\u10d0\u10e2\u10d8" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kab.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kab.js index b9f9bccf40..48f7d3bf55 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kab.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/kab.js @@ -150,7 +150,7 @@ tinymce.addI18n('kab',{ "Insert link": "Ger azday", "Insert\/edit link": "Ger\/\u1e93reg azday", "Text to display": "A\u1e0dris ara yettwabeqq\u1e0den", -"Url": "Url", +"Url": "URL", "Target": "Target", "None": "Ulac", "New window": "Asfaylu amaynut", @@ -258,4 +258,4 @@ tinymce.addI18n('kab',{ "Tools": "Ifecka", "Powered by {0}": "Iteddu s {0} ", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/km_KH.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/km_KH.js index 5c4b055126..381d4c4a46 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/km_KH.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/km_KH.js @@ -144,7 +144,7 @@ tinymce.addI18n('km_KH',{ "Insert link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\u200b\u178f\u17c6\u178e", "Insert\/edit link": "\u1794\u1789\u17d2\u1785\u17bc\u179b\/\u1780\u17c2 \u178f\u17c6\u178e", "Text to display": "\u17a2\u1780\u17d2\u179f\u179a\u200b\u178f\u17d2\u179a\u17bc\u179c\u200b\u1794\u1784\u17d2\u17a0\u17b6\u1789", -"Url": "Url", +"Url": "URL", "Target": "\u1791\u17b7\u179f\u178a\u17c5", "None": "\u1798\u17b7\u1793\u200b\u1798\u17b6\u1793", "New window": "\u1795\u17d2\u1791\u17b6\u17c6\u1784\u200b\u179c\u17b8\u1793\u178a\u17bc\u200b\u1790\u17d2\u1798\u17b8", @@ -250,4 +250,4 @@ tinymce.addI18n('km_KH',{ "Table": "\u178f\u17b6\u179a\u17b6\u1784", "Tools": "\u17a7\u1794\u1780\u179a\u178e\u17cd", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u1791\u17b8\u178f\u17b6\u17c6\u1784\u200b\u17a2\u1780\u17d2\u179f\u179a\u200b\u179f\u17c6\u1794\u17bc\u179a\u1794\u17c2\u1794\u17d4 \u1785\u17bb\u1785 ALT-F9 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1798\u17c9\u17ba\u1793\u17bb\u1799\u17d4 \u1785\u17bb\u1785 ALT-F10 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u179a\u1794\u17b6\u179a\u200b\u17a7\u1794\u1780\u179a\u178e\u17cd\u17d4 \u1785\u17bb\u1785 ALT-0 \u179f\u1798\u17d2\u179a\u17b6\u1794\u17cb\u200b\u1787\u17c6\u1793\u17bd\u1799\u17d4" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nb_NO.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nb_NO.js index 59233450b0..e6f1df8971 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nb_NO.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nb_NO.js @@ -150,7 +150,7 @@ tinymce.addI18n('nb_NO',{ "Insert link": "Sett inn lenke", "Insert\/edit link": "Sett inn\/endre lenke", "Text to display": "Tekst som skal vises", -"Url": "Url", +"Url": "URL", "Target": "M\u00e5l", "None": "Ingen", "New window": "Nytt vindu", @@ -258,4 +258,4 @@ tinymce.addI18n('nb_NO',{ "Tools": "Verkt\u00f8y", "Powered by {0}": "Redigert med {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Tekstredigering. Tast ALT-F9 for meny. Tast ALT-F10 for verkt\u00f8ys-rader. Tast ALT-0 for hjelp." -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nl.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nl.js index c80590b297..d8631c9ab6 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nl.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/nl.js @@ -150,7 +150,7 @@ tinymce.addI18n('nl',{ "Insert link": "Hyperlink invoegen", "Insert\/edit link": "Hyperlink invoegen\/bewerken", "Text to display": "Linktekst", -"Url": "Url", +"Url": "URL", "Target": "Doel", "None": "Geen", "New window": "Nieuw venster", @@ -258,4 +258,4 @@ tinymce.addI18n('nl',{ "Tools": "Gereedschap", "Powered by {0}": "Gemaakt door {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Druk ALT-F9 voor het menu. Druk ALT-F10 voor de toolbar. Druk ALT-0 voor help." -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_BR.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_BR.js index 497043a9d4..2beccd413b 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_BR.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/pt_BR.js @@ -150,7 +150,7 @@ tinymce.addI18n('pt_BR',{ "Insert link": "Inserir link", "Insert\/edit link": "Inserir\/editar link", "Text to display": "Texto para mostrar", -"Url": "Url", +"Url": "URL", "Target": "Alvo", "None": "Nenhum", "New window": "Nova janela", @@ -258,4 +258,4 @@ tinymce.addI18n('pt_BR',{ "Tools": "Ferramentas", "Powered by {0}": "Distribu\u00eddo por {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u00c1rea de texto formatado. Pressione ALT-F9 para exibir o menu, ALT-F10 para exibir a barra de ferramentas ou ALT-0 para exibir a ajuda" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ro.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ro.js index 0a6a2eadf0..a2f3caec80 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ro.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/ro.js @@ -121,7 +121,7 @@ tinymce.addI18n('ro',{ "Date\/time": "Data\/ora", "Insert date\/time": "Insereaz\u0103 data\/ora", "Remove link": "\u0218terge link-ul", -"Url": "Url", +"Url": "URL", "Text to display": "Text de afi\u0219at", "Anchors": "Ancor\u0103", "Insert link": "Inserare link", @@ -227,4 +227,4 @@ tinymce.addI18n('ro',{ "View": "Vezi", "Table": "Tabel\u0103", "Format": "Formateaz\u0103" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sk.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sk.js index 2362a6dbc6..5cc085abdc 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sk.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sk.js @@ -144,7 +144,7 @@ tinymce.addI18n('sk',{ "Insert link": "Vlo\u017ei\u0165 odkaz", "Insert\/edit link": "Vlo\u017ei\u0165\/upravi\u0165 odkaz", "Text to display": "Zobrazen\u00fd text", -"Url": "Url", +"Url": "URL", "Target": "Cie\u013e", "None": "\u017diadne", "New window": "Nov\u00e9 okno", @@ -250,4 +250,4 @@ tinymce.addI18n('sk',{ "Table": "Tabu\u013eka", "Tools": "N\u00e1stroje", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textov\u00e9 pole. Stla\u010dte ALT-F9 pre zobrazenie menu, ALT-F10 pre zobrazenie panela n\u00e1strojov, ALT-0 pre n\u00e1povedu." -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sr.js index 9150c2ed82..01bfad7303 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sr.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sr.js @@ -150,7 +150,7 @@ tinymce.addI18n('sr',{ "Insert link": "Ubaci vezu", "Insert\/edit link": "Ubaci\/promeni vezu", "Text to display": "Tekst za prikaz", -"Url": "Url", +"Url": "URL", "Target": "Meta", "None": "Ni\u0161ta", "New window": "Novi prozor", @@ -258,4 +258,4 @@ tinymce.addI18n('sr',{ "Tools": "Alatke", "Powered by {0}": "Pokre\u0107e ga {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Oboga\u0107en tekst. Pritisni te ALT-F9 za meni.Pritisnite ALT-F10 za traku sa alatkama.Pritisnite ALT-0 za pomo\u0107" -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sv_SE.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sv_SE.js index 83aaaef59d..b97ea68a18 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sv_SE.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/sv_SE.js @@ -150,7 +150,7 @@ tinymce.addI18n('sv_SE',{ "Insert link": "Infoga l\u00e4nk", "Insert\/edit link": "Infoga\/redigera l\u00e4nk", "Text to display": "Text att visa", -"Url": "Url", +"Url": "URL", "Target": "M\u00e5l", "None": "Ingen", "New window": "Nytt f\u00f6nster", @@ -158,8 +158,8 @@ tinymce.addI18n('sv_SE',{ "Anchors": "Bokm\u00e4rken", "Link": "L\u00e4nk", "Paste or type a link": "Klistra in eller skriv en l\u00e4nk", -"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Urlen du angav verkar vara en epost adress. Vill du l\u00e4gga till ett mailto: prefix?", -"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Urlen du angav verkar vara en extern l\u00e4nk. Vill du l\u00e4gga till http:\/\/ prefixet?", +"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "URLen du angav verkar vara en epost adress. Vill du l\u00e4gga till ett mailto: prefix?", +"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "URLen du angav verkar vara en extern l\u00e4nk. Vill du l\u00e4gga till http:\/\/ prefixet?", "Link list": "L\u00e4nklista", "Insert video": "Infoga video", "Insert\/edit video": "Infoga\/redigera video", @@ -258,4 +258,4 @@ tinymce.addI18n('sv_SE',{ "Tools": "Verktyg", "Powered by {0}": "Powered by {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Textredigerare. Tryck ALT-F9 f\u00f6r menyn. Tryck ALT-F10 f\u00f6r verktygsrader. Tryck ALT-0 f\u00f6r hj\u00e4lp." -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr.js index 7b69596402..3dd22ca25f 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr.js @@ -150,7 +150,7 @@ tinymce.addI18n('tr',{ "Insert link": "Ba\u011flant\u0131 ekle", "Insert\/edit link": "Ba\u011flant\u0131 ekle\/d\u00fczenle", "Text to display": "Yaz\u0131y\u0131 g\u00f6r\u00fcnt\u00fcle", -"Url": "Url", +"Url": "URL", "Target": "Hedef", "None": "Hi\u00e7biri", "New window": "Yeni pencere", @@ -258,4 +258,4 @@ tinymce.addI18n('tr',{ "Tools": "Ara\u00e7lar", "Powered by {0}": "Powered by {0}", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zengin Metin Alan\u0131. Men\u00fc i\u00e7in ALT-F9 tu\u015funa bas\u0131n\u0131z. Ara\u00e7 \u00e7ubu\u011fu i\u00e7in ALT-F10 tu\u015funa bas\u0131n\u0131z. Yard\u0131m i\u00e7in ALT-0 tu\u015funa bas\u0131n\u0131z." -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr_TR.js b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr_TR.js index ea89bc44c3..496fe3dc21 100644 --- a/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr_TR.js +++ b/src/Umbraco.Web.UI.Client/lib/tinymce/langs/tr_TR.js @@ -150,7 +150,7 @@ tinymce.addI18n('tr_TR',{ "Insert link": "Ba\u011flant\u0131 ekle", "Insert\/edit link": "Ba\u011flant\u0131 ekle\/d\u00fczenle", "Text to display": "G\u00f6r\u00fcnen yaz\u0131", -"Url": "Url", +"Url": "URL", "Target": "Hedef", "None": "Hi\u00e7biri", "New window": "Yeni pencere", @@ -258,4 +258,4 @@ tinymce.addI18n('tr_TR',{ "Tools": "Ara\u00e7lar", "Powered by {0}": "{0} taraf\u0131ndan yap\u0131lm\u0131\u015ft\u0131r ", "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Zengin Metin Alan\u0131. Men\u00fc i\u00e7in ALT-F9 k\u0131sayolunu kullan\u0131n. Ara\u00e7 \u00e7ubu\u011fu i\u00e7in ALT-F10 k\u0131sayolunu kullan\u0131n. Yard\u0131m i\u00e7in ALT-0 k\u0131sayolunu kullan\u0131n." -}); \ No newline at end of file +}); diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js index 1e929af6e9..d9bbb245f5 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js @@ -233,7 +233,7 @@ } function loadRedirectUrls() { scope.loadingRedirectUrls = true; - //check if Redirect Url Management is enabled + //check if Redirect URL Management is enabled redirectUrlsResource.getEnableState().then(function (response) { scope.urlTrackerDisabled = response.enabled !== true; if (scope.urlTrackerDisabled === false) { @@ -314,13 +314,13 @@ } function updateCurrentUrls() { - // never show urls for element types (if they happen to have been created in the content tree) + // never show URLs for element types (if they happen to have been created in the content tree) if (scope.node.isElement) { scope.currentUrls = null; return; } - // find the urls for the currently selected language + // find the URLs for the currently selected language if (scope.node.variants.length > 1) { // nodes with variants scope.currentUrls = _.filter(scope.node.urls, (url) => (scope.currentVariant.language && scope.currentVariant.language.culture === url.culture)); @@ -329,7 +329,7 @@ scope.currentUrls = scope.node.urls; } - // figure out if multiple cultures apply across the content urls + // figure out if multiple cultures apply across the content URLs scope.currentUrlsHaveMultipleCultures = _.keys(_.groupBy(scope.currentUrls, url => url.culture)).length > 1; } diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml index 4126d1d224..6e8ae35501 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml @@ -247,9 +247,9 @@ Tento dokument je publikován, ale není viditelný, protože jeho rodič '%0%' publikován není Tato jazyková verze je publikována, ale není viditelná, protože její rodič '%0%' publikován není Jejda: tento dokument je publikován, ale není v mezipaměti (vnitřní chyba) - Could not get the url - This document is published but its url would collide with content %0% - This document is published but its url cannot be routed + Could not get the URL + This document is published but its URL would collide with content %0% + This document is published but its URL cannot be routed Publikovat Published Published (pending changes)> @@ -452,7 +452,7 @@ Koš je nyní prázdný Odebrání položek z koše způsobí jejich trvalé odstranění regexlib.com má v tuto chvíli nějaké problémy, které jsou mimo naší kontrolu. Omlouváme se za vzniklé nepříjemnosti.]]> - Vyhledat regulární výraz pro přidání validace formulářového prvku. Například: 'email, 'PSČ' 'url' + Vyhledat regulární výraz pro přidání validace formulářového prvku. Například: 'email, 'PSČ' 'URL' Odstranit makro Pole je vyžadování Web je přeindexován @@ -745,7 +745,7 @@ Aktualizovat Povýšit Nahrání - Url + URL Uživatel Uživatelské jméno Hodnota diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index c123f1e428..7bd6dc63a2 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -245,8 +245,8 @@ Dette dokument er udgivet, men ikke synligt da den overliggende side '%0%' ikke er udgivet! Dette sprog er udgivet, men ikke synligt, da den overliggende side '%0%' ikke er udgivet! Ups: dette dokument er udgivet, men er ikke i cachen (intern fejl) - Kunne ikke hente url'en - Dette dokument er udgivet, men dets url ville kollidere med indholdet %0% + Kunne ikke hente URL'en + Dette dokument er udgivet, men dets URL ville kollidere med indholdet %0% Dette dokument er udgivet, men dets URL kan ikke dirigeres Udgiv Udgivet @@ -440,7 +440,7 @@ Papirkurven er nu tom Når elementer slettes fra papirkurven, slettes de for altid regexlib.com's webservice oplever i øjeblikket problemer, vi ikke har kontrol over. Beklager ulejligheden. ]]> - Søg efter et regulært udtryk for at tilføje validering til et formularfelt. Eksempel: 'e-mail', 'postnr.', 'url' + Søg efter et regulært udtryk for at tilføje validering til et formularfelt. Eksempel: 'e-mail', 'postnr.', 'URL' Fjern makro Obligatorisk Sitet er genindekseret @@ -741,7 +741,7 @@ Opdatér Opdatér Upload - Url + URL Bruger Brugernavn Værdi @@ -1497,7 +1497,7 @@ Mange hilsner fra Umbraco robotten Standard felter Store bogstaver URL encode - Hvis indholdet af felterne skal sendes til en url, skal denne slåes til så specialtegn formateres + Hvis indholdet af felterne skal sendes til en URL, skal denne slåes til så specialtegn formateres Denne tekst bruges hvis ovenstående felter er tomme Dette felt vil blive brugt hvis ovenstående felt er tomt Ja, med klokkeslæt. Dato/tid separator: @@ -1674,7 +1674,7 @@ Mange hilsner fra Umbraco robotten Validering Valider som e-mail Valider som tal - Valider som Url + Valider som URL ...eller indtast din egen validering Feltet er påkrævet Indtast et regulært udtryk diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml index 86b1d6c130..8d760ea034 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/de.xml @@ -446,7 +446,7 @@ Der Papierkorb ist leer Wenn Sie den Papierkorb leeren, werden die enthaltenen Elemente endgültig gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden. Der Webservice von <a target='_blank' href='http://regexlib.com'>regexlib.com</a> ist zur Zeit nicht erreichbar. Bitte versuchen Sie es später erneut. - Finden Sie einen vorbereiteten regulären Ausdruck zur Validierung der Werte, die in dieses Feld eingegeben werden - zum Beispiel 'email, 'plz', 'url' oder ähnlich. + Finden Sie einen vorbereiteten regulären Ausdruck zur Validierung der Werte, die in dieses Feld eingegeben werden - zum Beispiel 'email, 'plz', 'URL' oder ähnlich. Macro entfernen Pflichtfeld Die Website-Index wurd neu erstellt @@ -2178,7 +2178,7 @@ Kultur Original URL Weiterleiten zu - Url-Weiterleitungen verwalten + URL-Weiterleitungen verwalten Die folgenden URLs leiten auf diesen Inhalt: Es wurden keine Weiterleitungen angelegt diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index e32e6e2abe..dc246b3cd3 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -250,9 +250,9 @@ This document is published but is not visible because the parent '%0%' is unpublished This culture is published but is not visible because it is unpublished on parent '%0%' This document is published but is not in the cache - Could not get the url - This document is published but its url would collide with content %0% - This document is published but its url cannot be routed + Could not get the URL + This document is published but its URL would collide with content %0% + This document is published but its URL cannot be routed Publish Published Published (pending changes) @@ -467,7 +467,7 @@ The recycle bin is now empty When items are deleted from the recycle bin, they will be gone forever regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]> - Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url' + Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code', 'URL'. Remove Macro Required Field Site is reindexed @@ -773,7 +773,7 @@ Update Upgrade Upload - Url + URL User Username Value @@ -2056,8 +2056,8 @@ To manage your website, simply open the Umbraco back office and start adding con You can only have Add up to items - url(s) - url(s) selected + URL(s) + URL(s) selected items selected Invalid date Not a number @@ -2182,7 +2182,7 @@ To manage your website, simply open the Umbraco back office and start adding con Enable URL tracker Original URL Redirected To - Redirect Url Management + Redirect URL Management The following URLs redirect to this content item: No redirects have been made When a published page gets renamed or moved a redirect will automatically be made to the new page. diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index 1793393969..2959825645 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -254,9 +254,9 @@ This document is published but is not visible because the parent '%0%' is unpublished This culture is published but is not visible because it is unpublished on parent '%0%' This document is published but is not in the cache - Could not get the url - This document is published but its url would collide with content %0% - This document is published but its url cannot be routed + Could not get the URL + This document is published but its URL would collide with content %0% + This document is published but its URL cannot be routed Publish Published Published (pending changes)> @@ -472,7 +472,7 @@ The recycle bin is now empty When items are deleted from the recycle bin, they will be gone forever regexlib.com's webservice is currently experiencing some problems, which we have no control over. We are very sorry for this inconvenience.]]> - Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code' 'url' + Search for a regular expression to add validation to a form field. Example: 'email, 'zip-code', 'URL'. Remove Macro Required Field Site is reindexed @@ -781,7 +781,7 @@ Update Upgrade Upload - Url + URL User Username Value @@ -2074,8 +2074,8 @@ To manage your website, simply open the Umbraco back office and start adding con You can only have Add up to items - url(s) - url(s) selected + URL(s) + URL(s) selected items selected Invalid date Not a number @@ -2204,7 +2204,7 @@ To manage your website, simply open the Umbraco back office and start adding con Culture Original URL Redirected To - Redirect Url Management + Redirect URL Management The following URLs redirect to this content item: No redirects have been made When a published page gets renamed or moved a redirect will automatically be made to the new page. diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml index c35c84ebdc..6123bf719d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/es.xml @@ -185,8 +185,8 @@ Propiedades Este documento ha sido publicado pero no es visible porque el padre '%0%' no esta publicado Ups: este documento está publicado pero no está en la caché (error interno) - No se pudo obtener la url - Este documento está publicado pero tu url colisionará con contenido %0% + No se pudo obtener la URL + Este documento está publicado pero tu URL colisionará con contenido %0% Publicar Estado de la Publicación Publicar el @@ -321,7 +321,7 @@ La papelera está vacía No podrás recuperar los elementos una vez sean borrados de la papelera regexlib.com está experimentando algunos problemas en estos momentos, de los cuales no somos responsables. Pedimos disculpas por las molestias.]]> - Buscar una expresión regular para agregar validación a un campo de formulario. Ejemplo: 'correo electrónico', código postal "," url " + Buscar una expresión regular para agregar validación a un campo de formulario. Ejemplo: 'correo electrónico', 'código postal', 'URL'. Eliminar macro Campo obligatorio El sitio ha sido reindexado @@ -562,7 +562,7 @@ Actualizar Actualizar Subir - Url + URL Usuario Nombre de usuario Valor @@ -1526,7 +1526,7 @@ Validación Validar como email Validar como número - Validar como Url + Validar como URL ...o introduce tu propia validación Campo obligatorio Introduce una expresión regular diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml index b83ee4f9fe..e54bb9ee4e 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml @@ -245,9 +245,9 @@ Ce document est publié mais n'est pas visible car son parent '%0%' n'est pas publié Cette culture est publiée mais n'est pas visible car elle n'est pas publiée pour le parent '%0%' Ce document est publié mais n'est pas présent dans le cache - Oups: impossible d'obtenir cet url (erreur interne - voir fichier log) - Ce document est publié mais son url entrerait en collision avec le contenu %0% - Ce document est publié mais son url ne peut pas être routé + Oups: impossible d'obtenir cet URL (erreur interne - voir fichier log) + Ce document est publié mais son URL entrerait en collision avec le contenu %0% + Ce document est publié mais son URL ne peut pas être routé Publier Publié Publié (changements en cours) @@ -443,7 +443,7 @@ La corbeille est maintenant vide Les éléments supprimés de la corbeille seront supprimés définitivement regexlib.com rencontre actuellement des problèmes sur lesquels nous n'avons aucun contrôle. Nous sommes sincèrement désolés pour le désagrément.]]> - Rechercher une expression régulière à ajouter pour la validation d'un champ de formulaire. Exemple: 'email, 'zip-code', 'url' + Rechercher une expression régulière à ajouter pour la validation d'un champ de formulaire. Exemple: 'email, 'zip-code', 'URL'. Supprimer la macro Champ obligatoire Le site a été réindéxé @@ -742,7 +742,7 @@ Mettre à jour Upgrader Télécharger - Url + URL Utilisateur Nom d'utilisateur Valeur @@ -1990,7 +1990,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à Validation Valider comme email Valider comme nombre - Valider comme Url + Valider comme URL ...ou introduisez une validation spécifique Champ obligatoire Introduisez un message d'erreur de validation personnalisé (optionnel) @@ -2119,7 +2119,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à Culture URL original Redirigé Vers - Gestion des redirections d'Url + Gestion des redirections d'URL Les URLs suivants redirigent vers cet élément de contenu : Aucune redirection n'a été créée Lorsqu'une page publiée est renommée ou déplacée, une redirection sera automatiquement créée vers la nouvelle page. @@ -2355,4 +2355,4 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à ]]> - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml index 4866fff843..c7842ab5ff 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/it.xml @@ -187,7 +187,7 @@ regexlib.com ha attualmente qualche problema, di cui non abbiamo il controllo. Siamo spiacevoli dell'inconveniente.]]> - + Elimina Macro Campo obbligatorio @@ -330,7 +330,7 @@ Aggiorna Aggiornamento Carica - Url + URL Utente Valore @@ -742,7 +742,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i Campi Standard Maiuscolo - + diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml index 21559f915a..161a6fa0dd 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ja.xml @@ -247,7 +247,7 @@ ごみ箱は空です ごみ箱から削除すると復活させることはできません regexlib.comのウェブサービスに現在問題が起きているかもしれず、操作できませんでした。大変申し訳ありませんがこの機能は使用できません。]]> - フォームのフィールドを正規表現で検証できます。例: 'email, 'zip-code' 'url' + フォームのフィールドを正規表現で検証できます。例: 'email, 'zip-code' 'URL' マクロを削除 必須フィールド サイトは再インデックスされました diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml index a87f6f1410..dc2a2c8212 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ko.xml @@ -181,7 +181,7 @@ 휴지통이 비었습니다. 휴지통에서 삭제하시면 완전히 삭제됩니다. regexlib.com의 웹서비스는 현재 제어할 수 없는 몇가지 문제점이 보고되었습니다. 불편을 드려 대단히 죄송합니다.]]> - 필드 유효성검사를 위해 정규표현식을 검색합니다. 예: 'email, 'zip-code' 'url' + 필드 유효성검사를 위해 정규표현식을 검색합니다. 예: 'email, 'zip-code' 'URL' 매크로 삭제 필수 필드 사이트의 색인이 재생성되었습니다. @@ -326,7 +326,7 @@ 업데이트 업그레이드 업로드 - Url + URL 사용자 사용자 값 diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml index e7b5bc79fd..86bf8fa6f6 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml @@ -241,7 +241,7 @@ Papirkurven er nå tom Når elementer blir slettet fra papirkurven vil de være slettet for alltid regexlib.com tjenesten opplever for tiden problemer som vi ikke har kontroll over. Vi beklager denne ubeleiligheten.]]> - Søk etter et regulært uttrykk for å legge inn validering til et felt. Eksempel: 'email, 'zip-code' 'url' + Søk etter et regulært uttrykk for å legge inn validering til et felt. Eksempel: 'email, 'zip-code', 'URL'. Fjern makro Obligatorisk Nettstedet er indeksert @@ -398,7 +398,7 @@ Oppdater Oppgrader Last opp - Url + URL Bruker Brukernavn Verdi diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml index 8361383b58..206a273cf4 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml @@ -147,8 +147,8 @@ Eigenschappen Dit document is gepubliceerd maar niet zichtbaar omdat de bovenliggende node '%0%' niet gepubliceerd is Dit document is gepubliceerd, maar het staat niet in de cache (interne serverfout) - Kan de Url niet ophalen - Dit document is gepubliceerd, maar de Url conflicteert met %0% + Kan de URL niet ophalen + Dit document is gepubliceerd, maar de URL conflicteert met %0% Publiceren Publicatiestatus Publiceren op @@ -270,7 +270,7 @@ De prullenbak is nu leeg. Als items worden verwijderd uit de prullenbak, zijn ze voorgoed verwijderd. regexlib.com ondervindt momenteel problemen waarover we geen controle hebben. Onze excuses voor het ongemak.]]> - Zoek naar een reguliere expressie om validatie aan een formulierveld toe te voegen. Voorbeeld: 'email, 'post-code' 'url' + Zoek naar een reguliere expressie om validatie aan een formulierveld toe te voegen. Voorbeeld: 'email', 'postcode', 'URL'. Verwijder Macro Verplicht veld Site is opnieuw geïndexeerd @@ -469,7 +469,7 @@ Update Upgrade Upload - Url + URL Gebruiker Gebruikersnaam Waarde @@ -1292,7 +1292,7 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je Validatie Valideer als email Valideer als nummer - Valideer als Url + Valideer als URL ...of gebruik custom validatie Veld is verplicht diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml index fd806041c5..30da766fb9 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml @@ -322,7 +322,7 @@ Zawartość kosza została usunięta Usunięcie elementów z kosza powoduje ich trwałe i nieodwracalne skasowanie regexlib.com aktualnie nie jest dostępny, na co nie mamy wpływu. Bardzo przepraszamy za te utrudnienia.]]> - Przeszukaj dla wyrażeń regularnych, aby dodać regułę sprawdzającą do formularza. Np. 'email' 'url' + Przeszukaj dla wyrażeń regularnych, aby dodać regułę sprawdzającą do formularza. Np. 'email' 'URL' Usuń Makro Pole wymagane Strona została przeindeksowana diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml index 9fd4696c28..fbc70a6c47 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/pt.xml @@ -181,7 +181,7 @@ A lixeira agora está vazia Quando itens são removidos da lixeira estes somem para sempre regexlib.com está no momento sofrendo dificuldades dos quais não temos controle. Pedimos desculpas pela inconveniência.]]> - Busque por uma expressão regular para adicionar validação à um campo de formulário. Exemplo: 'email', 'zip-code' (código postal), 'url' + Busque por uma expressão regular para adicionar validação à um campo de formulário. Exemplo: 'email', 'zip-code' (código postal), 'URL' Remover Macro Campo obrigatório Site foi re-indexado @@ -324,7 +324,7 @@ Atualizar Atualizar Subir (Upload) - Url + URL Usuário Usuário Valor diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml index 7a3e099262..0569412945 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml @@ -372,7 +372,7 @@ Корзина пуста Вы больше не сможете восстановить элементы, удаленные из корзины regexlib.com испытывает в настоящее время некоторые трудности, не зависящие от нас. Просим извинить за причиненные неудобства.]]> - Используйте поиск регулярных выражений для добавления сервиса проверки к полю Вашей формы. Например: 'email, 'zip-code', 'url' + Используйте поиск регулярных выражений для добавления сервиса проверки к полю Вашей формы. Например: 'email, 'zip-code', 'URL' Удалить макрос Обязательное поле Сайт переиндексирован @@ -1829,7 +1829,7 @@ Валидация Валидация по формату email Валидация числового значения - Валидация по формату Url + Валидация по формату URL ...или указать свои правила валидации Обязательно к заполнению Задайте регулярное выражение diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml index e7e7abe2cd..0e5353f477 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/sv.xml @@ -301,7 +301,7 @@ Papperskorgen är nu tom Om du tömmer papperskorgen kommer allt som ligger i den att tas bort permanent regexlib.com's webbtjänst har för närvarande driftsstörningar. Tyvärr kan vi inte göra något åt detta.]]> - Sök efter en regular expression som kan validera ett formulärsfält. t.ex. 'email' eller 'url' + Sök efter en regular expression som kan validera ett formulärsfält. t.ex. 'email' eller 'URL' Ta bort makro Obligatoriskt formulärsfält Webbplatsen har indexerats @@ -864,7 +864,7 @@ Standardfält Versaler URL-koda - Om fältets innehåll skall sändas till en url, skall detta slås på så att specialtecken kodas + Om fältets innehåll skall sändas till en URL, skall detta slås på så att specialtecken kodas Texten kommer användas om ovanstående fält är tomma Fältet kommer användas om det primära fältet ovan är tomt Ja, med tid. Separator: diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml index 13ce48adfe..4d54d632c2 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/tr.xml @@ -210,7 +210,7 @@ Geri dönüşüm kutusu artık boş Öğeleri geri dönüşüm kutusu silindiğinde, onlar sonsuza kadar gitmiş olacak regexlib.com's webcoder şu anda üzerinde hiçbir kontrole sahip bazı sorunları, yaşanıyor. Bu rahatsızlıktan dolayı çok üzgünüz.]]> - Bir düzenli ifade arama form alanına doğrulama ekleyin. Örnek: 'E-posta', zip code 'url' + Bir düzenli ifade arama form alanına doğrulama ekleyin. Örnek: 'E-posta', 'zip code', 'URL'. Makro kaldır Gerekli alan Site yeniden indekslendi diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml index 5210b46bcc..c2a24e0c9f 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml @@ -146,8 +146,8 @@ 属性 该文档不可见，因为其上级 '%0%' 未发布。 该文档已发布，但是没有更新至缓存（内部错误） - Could not get the url - This document is published but its url would collide with content %0% + Could not get the URL + This document is published but its URL would collide with content %0% 发布 发布状态 发布于 @@ -258,7 +258,7 @@ 回收站已清空 从回收站删除的项目将不可恢复 regexlib.com的服务暂时出现问题。]]> - 查找正则表达式来验证输入，如: 'email、'zip-code'、'url'。 + 查找正则表达式来验证输入，如: 'email、'zip-code'、'URL'。 移除宏 必填项 站点已重建索引 @@ -1156,7 +1156,7 @@ 验证 验证为电子邮件 验证为数字 - 验证为 url + 验证为 URL ...或输入自定义验证 字段是强制性的 @@ -1245,19 +1245,19 @@ %0%.]]> - 禁用 url 跟踪程序 - 启用 url 跟踪程序 + 禁用 URL 跟踪程序 + 启用 URL 跟踪程序 原始网址 已重定向至 未进行重定向 当已发布的页重命名或移动时, 将自动对新页进行重定向。 确实要删除 "%0%" 到 "%1%" 的重定向吗？ 重定向URL已删除。 - 删除重定向 url 时出错. - 是否确实要禁用 url 跟踪程序? - url 跟踪器现在已被禁用。 - 禁用 url 跟踪程序时出错, 可以在日志文件中找到更多信息。 - 现在已启用 url 跟踪程序。 - 启用 url 跟踪程序时出错, 可以在日志文件中找到更多信息。 + 删除重定向 URL 时出错. + 是否确实要禁用 URL 跟踪程序? + URL 跟踪器现在已被禁用。 + 禁用 URL 跟踪程序时出错, 可以在日志文件中找到更多信息。 + 现在已启用 URL 跟踪程序。 + 启用 URL 跟踪程序时出错, 可以在日志文件中找到更多信息。 diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml index 320c3f63d8..a4bcb0531d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml @@ -255,7 +255,7 @@ 回收站已清空 從回收站刪除的項目將不可恢復 regexlib.com的網站服務目前出現些狀況，而我們無能為力。我們對此不便感到十分抱歉。]]> - 查找規則運算式來驗證輸入，如: 'email、'zip-code'、'url'。 + 查找規則運算式來驗證輸入，如: 'email、'zip-code'、'URL'。 移除巨集 必填項目 網站已重建索引 diff --git a/src/Umbraco.Web/Compose/NotificationsComponent.cs b/src/Umbraco.Web/Compose/NotificationsComponent.cs index 24c7992dd2..ea5df65f74 100644 --- a/src/Umbraco.Web/Compose/NotificationsComponent.cs +++ b/src/Umbraco.Web/Compose/NotificationsComponent.cs @@ -242,7 +242,7 @@ namespace Umbraco.Web.Compose if (sender == null) throw new ArgumentNullException(nameof(sender)); if (siteUri == null) { - _logger.Warn(typeof(Notifier), "Notifications can not be sent, no site url is set (might be during boot process?)"); + _logger.Warn(typeof(Notifier), "Notifications can not be sent, no site URL is set (might be during boot process?)"); return; } diff --git a/src/Umbraco.Web/CompositionExtensions.cs b/src/Umbraco.Web/CompositionExtensions.cs index 27a56afc1e..18af4b6b8d 100644 --- a/src/Umbraco.Web/CompositionExtensions.cs +++ b/src/Umbraco.Web/CompositionExtensions.cs @@ -84,14 +84,14 @@ namespace Umbraco.Web => composition.WithCollectionBuilder(); /// - /// Gets the url providers collection builder. + /// Gets the URL providers collection builder. /// /// The composition. public static UrlProviderCollectionBuilder UrlProviders(this Composition composition) => composition.WithCollectionBuilder(); /// - /// Gets the media url providers collection builder. + /// Gets the media URL providers collection builder. /// /// The composition. public static MediaUrlProviderCollectionBuilder MediaUrlProviders(this Composition composition) diff --git a/src/Umbraco.Web/Controllers/UmbLoginController.cs b/src/Umbraco.Web/Controllers/UmbLoginController.cs index 88bc17abff..63968d99ca 100644 --- a/src/Umbraco.Web/Controllers/UmbLoginController.cs +++ b/src/Umbraco.Web/Controllers/UmbLoginController.cs @@ -42,8 +42,8 @@ namespace Umbraco.Web.Controllers //if there is a specified path to redirect to then use it if (model.RedirectUrl.IsNullOrWhiteSpace() == false) { - // validate the redirect url - // if it's not a local url we'll redirect to the root of the current site + // validate the redirect URL + // if it's not a local URL we'll redirect to the root of the current site return Redirect(Url.IsLocalUrl(model.RedirectUrl) ? model.RedirectUrl : CurrentPage.AncestorOrSelf(1).Url()); diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs index 60d3a6f779..ae52405daf 100644 --- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs +++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs @@ -109,7 +109,7 @@ namespace Umbraco.Web.Editors { // TODO: Add 'umbracoApiControllerBaseUrl' which people can use in JS // to prepend their URL. We could then also use this in our own resources instead of - // having each url defined here explicitly - we can do that in v8! for now + // having each URL defined here explicitly - we can do that in v8! for now // for umbraco services we'll stick to explicitly defining the endpoints. {"externalLoginsUrl", _urlHelper.Action("ExternalLogin", "BackOffice")}, diff --git a/src/Umbraco.Web/Editors/CodeFileController.cs b/src/Umbraco.Web/Editors/CodeFileController.cs index 5ddbb506c9..0e1c4b3e60 100644 --- a/src/Umbraco.Web/Editors/CodeFileController.cs +++ b/src/Umbraco.Web/Editors/CodeFileController.cs @@ -139,7 +139,7 @@ namespace Umbraco.Web.Editors /// Used to get a specific file from disk via the FileService /// /// This is a string but will be 'scripts' 'partialViews', 'partialViewMacros' or 'stylesheets' - /// The filename or urlencoded path of the file to open + /// The filename or URL encoded path of the file to open /// The file and its contents from the virtualPath public CodeFileDisplay GetByPath(string type, string virtualPath) { @@ -291,7 +291,7 @@ namespace Umbraco.Web.Editors /// Used to delete a specific file from disk via the FileService /// /// This is a string but will be 'scripts' 'partialViews', 'partialViewMacros' or 'stylesheets' - /// The filename or urlencoded path of the file to delete + /// The filename or URL encoded path of the file to delete /// Will return a simple 200 if file deletion succeeds [HttpDelete] [HttpPost] diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs index 3938ae5ab8..65d9305906 100644 --- a/src/Umbraco.Web/Editors/EntityController.cs +++ b/src/Umbraco.Web/Editors/EntityController.cs @@ -207,7 +207,7 @@ namespace Umbraco.Web.Editors } /// - /// Gets the url of an entity + /// Gets the URL of an entity /// /// UDI of the entity to fetch URL for /// The culture to fetch the URL for @@ -236,7 +236,7 @@ namespace Umbraco.Web.Editors } /// - /// Gets the url of an entity + /// Gets the URL of an entity /// /// Int id of the entity to fetch URL for /// The type of entity such as Document, Media, Member diff --git a/src/Umbraco.Web/Editors/PreviewController.cs b/src/Umbraco.Web/Editors/PreviewController.cs index f148655acd..d8979e75b2 100644 --- a/src/Umbraco.Web/Editors/PreviewController.cs +++ b/src/Umbraco.Web/Editors/PreviewController.cs @@ -107,7 +107,7 @@ namespace Umbraco.Web.Editors Response.Cookies.Set(new HttpCookie(Constants.Web.PreviewCookieName, previewToken)); - // use a numeric url because content may not be in cache and so .Url would fail + // use a numeric URL because content may not be in cache and so .Url would fail var query = culture.IsNullOrWhiteSpace() ? string.Empty : $"?culture={culture}"; Response.Redirect($"../../{id}.aspx{query}", true); diff --git a/src/Umbraco.Web/Editors/UsersController.cs b/src/Umbraco.Web/Editors/UsersController.cs index 76c4228a01..5b1c72ff78 100644 --- a/src/Umbraco.Web/Editors/UsersController.cs +++ b/src/Umbraco.Web/Editors/UsersController.cs @@ -49,7 +49,7 @@ namespace Umbraco.Web.Editors } /// - /// Returns a list of the sizes of gravatar urls for the user or null if the gravatar server cannot be reached + /// Returns a list of the sizes of gravatar URLs for the user or null if the gravatar server cannot be reached /// /// public string[] GetCurrentUserAvatarUrls() @@ -478,7 +478,7 @@ namespace Umbraco.Web.Editors WebUtility.UrlEncode("|"), token.ToUrlBase64()); - // Get an mvc helper to get the url + // Get an mvc helper to get the URL var http = EnsureHttpContext(); var urlHelper = new UrlHelper(http.Request.RequestContext); var action = urlHelper.Action("VerifyInvite", "BackOffice", diff --git a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs index 1d518fa1d3..4d1a6fba5b 100644 --- a/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs +++ b/src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs @@ -26,7 +26,7 @@ namespace Umbraco.Web /// /// /// - /// The post url used to sign in with external logins - this can change depending on for what service the external login is service. + /// The post URL used to sign in with external logins - this can change depending on for what service the external login is service. /// Example: normal back office login or authenticating upgrade login /// /// diff --git a/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs index 7ac5578d75..f39b267e18 100644 --- a/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs +++ b/src/Umbraco.Web/ImageCropperTemplateCoreExtensions.cs @@ -12,7 +12,7 @@ namespace Umbraco.Web public static class ImageCropperTemplateCoreExtensions { /// - /// Gets the ImageProcessor Url by the crop alias (from the "umbracoFile" property alias) on the IPublishedContent item + /// Gets the ImageProcessor URL by the crop alias (from the "umbracoFile" property alias) on the IPublishedContent item /// /// /// The IPublishedContent item. @@ -21,7 +21,7 @@ namespace Umbraco.Web /// The crop alias e.g. thumbnail /// /// - /// The ImageProcessor.Web Url. + /// The ImageProcessor.Web URL. /// public static string GetCropUrl(this IPublishedContent mediaItem, string cropAlias, IImageUrlGenerator imageUrlGenerator) { @@ -29,7 +29,7 @@ namespace Umbraco.Web } /// - /// Gets the ImageProcessor Url by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item. + /// Gets the ImageProcessor URL by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item. /// /// /// The IPublishedContent item. @@ -41,7 +41,7 @@ namespace Umbraco.Web /// The crop alias e.g. thumbnail /// /// - /// The ImageProcessor.Web Url. + /// The ImageProcessor.Web URL. /// public static string GetCropUrl(this IPublishedContent mediaItem, string propertyAlias, string cropAlias, IImageUrlGenerator imageUrlGenerator) { @@ -49,7 +49,7 @@ namespace Umbraco.Web } /// - /// Gets the ImageProcessor Url from the IPublishedContent item. + /// Gets the ImageProcessor URL from the IPublishedContent item. /// /// /// The IPublishedContent item. @@ -156,10 +156,10 @@ namespace Umbraco.Web } /// - /// Gets the ImageProcessor Url from the image path. + /// Gets the ImageProcessor URL from the image path. /// /// - /// The image url. + /// The image URL. /// /// /// The width of the output image. @@ -238,13 +238,13 @@ namespace Umbraco.Web } /// - /// Gets the ImageProcessor Url from the image path. + /// Gets the ImageProcessor URL from the image path. /// /// - /// The image url. + /// The image URL. /// /// - /// The generator that will process all the options and the image URL to return a full image urls with all processing options appended + /// The generator that will process all the options and the image URL to return a full image URLs with all processing options appended /// /// /// diff --git a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs index f3833ba42a..26dd2a5d36 100644 --- a/src/Umbraco.Web/ImageCropperTemplateExtensions.cs +++ b/src/Umbraco.Web/ImageCropperTemplateExtensions.cs @@ -13,12 +13,12 @@ using Umbraco.Web.Models; namespace Umbraco.Web { /// - /// Provides extension methods for getting ImageProcessor Url from the core Image Cropper property editor + /// Provides extension methods for getting ImageProcessor URL from the core Image Cropper property editor /// public static class ImageCropperTemplateExtensions { /// - /// Gets the ImageProcessor Url by the crop alias (from the "umbracoFile" property alias) on the IPublishedContent item + /// Gets the ImageProcessor URL by the crop alias (from the "umbracoFile" property alias) on the IPublishedContent item /// /// /// The IPublishedContent item. @@ -27,12 +27,12 @@ namespace Umbraco.Web /// The crop alias e.g. thumbnail /// /// - /// The ImageProcessor.Web Url. + /// The ImageProcessor.Web URL. /// public static string GetCropUrl(this IPublishedContent mediaItem, string cropAlias) => ImageCropperTemplateCoreExtensions.GetCropUrl(mediaItem, cropAlias, Current.ImageUrlGenerator); /// - /// Gets the ImageProcessor Url by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item. + /// Gets the ImageProcessor URL by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item. /// /// /// The IPublishedContent item. @@ -44,12 +44,12 @@ namespace Umbraco.Web /// The crop alias e.g. thumbnail /// /// - /// The ImageProcessor.Web Url. + /// The ImageProcessor.Web URL. /// public static string GetCropUrl(this IPublishedContent mediaItem, string propertyAlias, string cropAlias) => ImageCropperTemplateCoreExtensions.GetCropUrl(mediaItem, propertyAlias, cropAlias, Current.ImageUrlGenerator); /// - /// Gets the ImageProcessor Url from the IPublishedContent item. + /// Gets the ImageProcessor URL from the IPublishedContent item. /// /// /// The IPublishedContent item. @@ -118,10 +118,10 @@ namespace Umbraco.Web bool upScale = true) => ImageCropperTemplateCoreExtensions.GetCropUrl(mediaItem, Current.ImageUrlGenerator, width, height, propertyAlias, cropAlias, quality, imageCropMode, imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBuster, furtherOptions, ratioMode, upScale); /// - /// Gets the ImageProcessor Url from the image path. + /// Gets the ImageProcessor URL from the image path. /// /// - /// The image url. + /// The image URL. /// /// /// The width of the output image. @@ -187,10 +187,10 @@ namespace Umbraco.Web bool upScale = true) => ImageCropperTemplateCoreExtensions.GetCropUrl(imageUrl, Current.ImageUrlGenerator, width, height, imageCropperValue, cropAlias, quality, imageCropMode, imageCropAnchor, preferFocalPoint, useCropDimensions, cacheBusterValue, furtherOptions, ratioMode, upScale); /// - /// Gets the ImageProcessor Url from the image path. + /// Gets the ImageProcessor URL from the image path. /// /// - /// The image url. + /// The image URL. /// /// /// diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs index 902ebbcd53..fa40ea517c 100644 --- a/src/Umbraco.Web/Install/Controllers/InstallController.cs +++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs @@ -61,7 +61,7 @@ namespace Umbraco.Web.Install.Controllers } } - // gen the install base url + // gen the install base URL ViewData.SetInstallApiBaseUrl(Url.GetUmbracoApiService("GetSetup", "InstallApi", "UmbracoInstall").TrimEnd("GetSetup")); // get the base umbraco folder diff --git a/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs b/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs index 9e34815def..6dc7c76d8e 100644 --- a/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs +++ b/src/Umbraco.Web/Media/EmbedProviders/EmbedProviderBase.cs @@ -25,7 +25,7 @@ namespace Umbraco.Web.Media.EmbedProviders public virtual string GetEmbedProviderUrl(string url, int maxWidth, int maxHeight) { if (Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute) == false) - throw new ArgumentException("Not a valid Url"); + throw new ArgumentException("Not a valid URL.", nameof(url)); var fullUrl = new StringBuilder(); diff --git a/src/Umbraco.Web/Models/ContentEditing/CodeFileDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/CodeFileDisplay.cs index 8c89bf263e..36ad82444a 100644 --- a/src/Umbraco.Web/Models/ContentEditing/CodeFileDisplay.cs +++ b/src/Umbraco.Web/Models/ContentEditing/CodeFileDisplay.cs @@ -27,7 +27,7 @@ namespace Umbraco.Web.Models.ContentEditing /// /// Path represents the path used by the backoffice tree - /// For files stored on disk, this is a urlencoded, comma separated + /// For files stored on disk, this is a URL encoded, comma separated /// path to the file, always starting with -1. /// /// -1,Partials,Parials%2FFolder,Partials%2FFolder%2FFile.cshtml diff --git a/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs index 50ed4684d9..983172f8e1 100644 --- a/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs +++ b/src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs @@ -173,7 +173,7 @@ namespace Umbraco.Web.Models.Mapping var umbracoContext = _umbracoContextAccessor.UmbracoContext; var urls = umbracoContext == null - ? new[] { UrlInfo.Message("Cannot generate urls without a current Umbraco Context") } + ? new[] { UrlInfo.Message("Cannot generate URLs without a current Umbraco Context") } : source.GetContentUrls(_publishedRouter, umbracoContext, _localizationService, _localizedTextService, _contentService, _logger).ToArray(); return urls; diff --git a/src/Umbraco.Web/Models/PublishedContentBase.cs b/src/Umbraco.Web/Models/PublishedContentBase.cs index d6a57a66d7..55e8a8687a 100644 --- a/src/Umbraco.Web/Models/PublishedContentBase.cs +++ b/src/Umbraco.Web/Models/PublishedContentBase.cs @@ -9,7 +9,7 @@ namespace Umbraco.Web.Models /// /// Provide an abstract base class for IPublishedContent implementations. /// - /// This base class does which (a) consistently resolves and caches the Url, (b) provides an implementation + /// This base class does which (a) consistently resolves and caches the URL, (b) provides an implementation /// for this[alias], and (c) provides basic content set management. [DebuggerDisplay("Content Id: {Id}")] public abstract class PublishedContentBase : IPublishedContent diff --git a/src/Umbraco.Web/Models/Trees/MenuItem.cs b/src/Umbraco.Web/Models/Trees/MenuItem.cs index 094c6b24ff..fb4dfb836c 100644 --- a/src/Umbraco.Web/Models/Trees/MenuItem.cs +++ b/src/Umbraco.Web/Models/Trees/MenuItem.cs @@ -165,7 +165,7 @@ namespace Umbraco.Web.Models.Trees } /// - /// Sets the menu item to display a dialog based on a url path in an iframe + /// Sets the menu item to display a dialog based on a URL path in an iframe /// /// /// diff --git a/src/Umbraco.Web/Models/Trees/TreeNode.cs b/src/Umbraco.Web/Models/Trees/TreeNode.cs index dc383bd18b..10684b519e 100644 --- a/src/Umbraco.Web/Models/Trees/TreeNode.cs +++ b/src/Umbraco.Web/Models/Trees/TreeNode.cs @@ -64,13 +64,13 @@ namespace Umbraco.Web.Models.Trees public string RoutePath { get; set; } /// - /// The JSON url to load the nodes children + /// The JSON URL to load the nodes children /// [DataMember(Name = "childNodesUrl")] public string ChildNodesUrl { get; set; } /// - /// The JSON url to load the menu from + /// The JSON URL to load the menu from /// [DataMember(Name = "menuUrl")] public string MenuUrl { get; set; } diff --git a/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs b/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs index 493d9deed2..82a9c42235 100644 --- a/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs +++ b/src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs @@ -66,11 +66,11 @@ namespace Umbraco.Web.Mvc //var meta = PluginController.GetMetadata(controllerType); if (isMvc) { - //create a new route with custom name, specified url, and the namespace of the controller plugin + //create a new route with custom name, specified URL, and the namespace of the controller plugin controllerPluginRoute = routes.MapRoute( //name string.Format("umbraco-{0}-{1}", area.AreaName, controllerName), - //url format + //URL format url, //set the namespace of the controller to match new[] {controllerType.Namespace}); @@ -89,7 +89,7 @@ namespace Umbraco.Web.Mvc controllerPluginRoute = routes.MapHttpRoute( //name string.Format("umbraco-{0}-{1}-{2}", "api", area.AreaName, controllerName), - //url format + //URL format url, new {controller = controllerName, id = defaultId}); //web api routes don't set the data tokens object diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs index 64bdac669f..28f2449187 100644 --- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs +++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs @@ -155,10 +155,10 @@ namespace Umbraco.Web.Mvc }; } - + /// - /// Handles a posted form to an Umbraco Url and ensures the correct controller is routed to and that + /// Handles a posted form to an Umbraco URL and ensures the correct controller is routed to and that /// the right DataTokens are set. /// /// diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs index 8af2d98018..522a81d7b2 100644 --- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs @@ -13,7 +13,7 @@ namespace Umbraco.Web.PropertyEditors [DataEditor( Constants.PropertyEditors.Aliases.MultiUrlPicker, EditorType.PropertyValue, - "Multi Url Picker", + "Multi URL Picker", "multiurlpicker", ValueType = ValueTypes.Json, Group = Constants.PropertyEditors.Groups.Pickers, diff --git a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs index 853e995ed8..5a84e4b20c 100644 --- a/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs +++ b/src/Umbraco.Web/PropertyEditors/MultiUrlPickerValueEditor.cs @@ -141,7 +141,7 @@ namespace Umbraco.Web.PropertyEditors QueryString = link.QueryString, Target = link.Target, Udi = link.Udi, - Url = link.Udi == null ? link.Url : null, // only save the url for external links + Url = link.Udi == null ? link.Url : null, // only save the URL for external links }, new JsonSerializerSettings { diff --git a/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs b/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs index 67ff82a3e1..5a3334685c 100644 --- a/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs +++ b/src/Umbraco.Web/PropertyEditors/RichTextEditorPastedImages.cs @@ -96,7 +96,7 @@ namespace Umbraco.Web.PropertyEditors // Add the UDI to the img element as new data attribute img.SetAttributeValue("data-udi", udi.ToString()); - // Get the new persisted image url + // Get the new persisted image URL var mediaTyped = _umbracoContextAccessor?.UmbracoContext?.Media.GetById(udi.Guid); if (mediaTyped == null) throw new PanicException($"Could not find media by id {udi.Guid} or there was no UmbracoContext available."); diff --git a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs index b3498c16ae..ca3bd36374 100644 --- a/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs +++ b/src/Umbraco.Web/PropertyEditors/RteEmbedController.cs @@ -29,8 +29,8 @@ namespace Umbraco.Web.PropertyEditors foreach (var provider in _embedCollection) { - //Url Scheme Regex is an array of possible regex patterns to match against the URL - foreach(var urlPattern in provider.UrlSchemeRegex) + // UrlSchemeRegex is an array of possible regex patterns to match against the URL + foreach (var urlPattern in provider.UrlSchemeRegex) { var regexPattern = new Regex(urlPattern, RegexOptions.IgnoreCase); if (regexPattern.IsMatch(url)) @@ -60,7 +60,7 @@ namespace Umbraco.Web.PropertyEditors } catch(Exception ex) { - Logger.Error(ex, "Error embedding url {Url} - width: {Width} height: {Height}", url, width, height); + Logger.Error(ex, "Error embedding URL {Url} - width: {Width} height: {Height}", url, width, height); result.OEmbedStatus = OEmbedStatus.Error; } diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs index 5c027ed9b6..8abb77839d 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs @@ -41,7 +41,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters if (source == null) return null; var sourceString = source.ToString(); - // ensures string is parsed for {localLink} and urls are resolved correctly + // ensures string is parsed for {localLink} and URLs are resolved correctly sourceString = _localLinkParser.EnsureInternalLinks(sourceString, preview); sourceString = _urlParser.EnsureUrls(sourceString); diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs index 3ab502742c..46fda1ea59 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs @@ -87,7 +87,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters var sourceString = source.ToString(); - // ensures string is parsed for {localLink} and urls and media are resolved correctly + // ensures string is parsed for {localLink} and URLs and media are resolved correctly sourceString = _linkParser.EnsureInternalLinks(sourceString, preview); sourceString = _urlParser.EnsureUrls(sourceString); sourceString = _imageSourceParser.EnsureImageSources(sourceString); diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/TextStringValueConverter.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/TextStringValueConverter.cs index 939a658407..65c0deeacf 100644 --- a/src/Umbraco.Web/PropertyEditors/ValueConverters/TextStringValueConverter.cs +++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/TextStringValueConverter.cs @@ -39,7 +39,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters if (source == null) return null; var sourceString = source.ToString(); - // ensures string is parsed for {localLink} and urls are resolved correctly + // ensures string is parsed for {localLink} and URLs are resolved correctly sourceString = _linkParser.EnsureInternalLinks(sourceString, preview); sourceString = _urlParser.EnsureUrls(sourceString); diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs index 8e6e517aea..a0224f90ea 100644 --- a/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs @@ -109,8 +109,8 @@ namespace Umbraco.Web.PublishedCache.NuCache content = FollowRoute(content, parts, 1, culture); } - // if hideTopLevelNodePath is true then for url /foo we looked for /*/foo - // but maybe that was the url of a non-default top-level node, so we also + // if hideTopLevelNodePath is true then for URL /foo we looked for /*/foo + // but maybe that was the URL of a non-default top-level node, so we also // have to look for /foo (see note in ApplyHideTopLevelNodeFromPath). if (content == null && hideTopLevelNode.Value && parts.Length == 1) { @@ -141,7 +141,7 @@ namespace Umbraco.Web.PublishedCache.NuCache hideTopLevelNode = hideTopLevelNode ?? HideTopLevelNodeFromPath; // default = settings // walk up from that node until we hit a node with a domain, - // or we reach the content root, collecting urls in the way + // or we reach the content root, collecting URLs in the way var pathParts = new List(); var n = node; var urlSegment = n.UrlSegment(culture); diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs index 73148b667a..f4c11977dc 100644 --- a/src/Umbraco.Web/PublishedContentExtensions.cs +++ b/src/Umbraco.Web/PublishedContentExtensions.cs @@ -1333,25 +1333,25 @@ namespace Umbraco.Web #region Url /// - /// Gets the url of the content item. + /// Gets the URL of the content item. /// /// - /// If the content item is a document, then this method returns the url of the - /// document. If it is a media, then this methods return the media url for the - /// 'umbracoFile' property. Use the MediaUrl() method to get the media url for other + /// If the content item is a document, then this method returns the URL of the + /// document. If it is a media, then this methods return the media URL for the + /// 'umbracoFile' property. Use the MediaUrl() method to get the media URL for other /// properties. /// The value of this property is contextual. It depends on the 'current' request uri, - /// if any. In addition, when the content type is multi-lingual, this is the url for the - /// specified culture. Otherwise, it is the invariant url. + /// if any. In addition, when the content type is multi-lingual, this is the URL for the + /// specified culture. Otherwise, it is the invariant URL. /// public static string Url(this IPublishedContent content, string culture = null, UrlMode mode = UrlMode.Default) { var umbracoContext = Composing.Current.UmbracoContext; if (umbracoContext == null) - throw new InvalidOperationException("Cannot resolve a Url when Current.UmbracoContext is null."); + throw new InvalidOperationException("Cannot resolve a URL when Current.UmbracoContext is null."); if (umbracoContext.UrlProvider == null) - throw new InvalidOperationException("Cannot resolve a Url when Current.UmbracoContext.UrlProvider is null."); + throw new InvalidOperationException("Cannot resolve a URL when Current.UmbracoContext.UrlProvider is null."); switch (content.ContentType.ItemType) { diff --git a/src/Umbraco.Web/PublishedElementExtensions.cs b/src/Umbraco.Web/PublishedElementExtensions.cs index f28581eb42..4c71e75f85 100644 --- a/src/Umbraco.Web/PublishedElementExtensions.cs +++ b/src/Umbraco.Web/PublishedElementExtensions.cs @@ -193,17 +193,17 @@ namespace Umbraco.Web #region MediaUrl /// - /// Gets the url for a media. + /// Gets the URL for a media. /// /// The content item. /// The culture (use current culture by default). - /// The url mode (use site configuration by default). + /// The URL mode (use site configuration by default). /// The alias of the property (use 'umbracoFile' by default). - /// The url for the media. + /// The URL for the media. /// /// The value of this property is contextual. It depends on the 'current' request uri, - /// if any. In addition, when the content type is multi-lingual, this is the url for the - /// specified culture. Otherwise, it is the invariant url. + /// if any. In addition, when the content type is multi-lingual, this is the URL for the + /// specified culture. Otherwise, it is the invariant URL. /// public static string MediaUrl(this IPublishedContent content, string culture = null, UrlMode mode = UrlMode.Default, string propertyAlias = Constants.Conventions.Media.File) { diff --git a/src/Umbraco.Web/RoutableDocumentFilter.cs b/src/Umbraco.Web/RoutableDocumentFilter.cs index 9725ce0e14..507a40e471 100644 --- a/src/Umbraco.Web/RoutableDocumentFilter.cs +++ b/src/Umbraco.Web/RoutableDocumentFilter.cs @@ -45,7 +45,7 @@ namespace Umbraco.Web var maybeDoc = true; var lpath = uri.AbsolutePath.ToLowerInvariant(); - // handle directory-urls used for asmx + // handle directory-URLs used for asmx // TODO: legacy - what's the point really? var asmxPos = lpath.IndexOf(".asmx/", StringComparison.OrdinalIgnoreCase); if (asmxPos >= 0) @@ -124,7 +124,7 @@ namespace Umbraco.Web return newReservedList; }); - //The url should be cleaned up before checking: + //The URL should be cleaned up before checking: // * If it doesn't contain an '.' in the path then we assume it is a path based URL, if that is the case we should add an trailing '/' because all of our reservedPaths use a trailing '/' // * We shouldn't be comparing the query at all var pathPart = url.Split(new[] { '?' }, StringSplitOptions.RemoveEmptyEntries)[0].ToLowerInvariant(); @@ -133,7 +133,7 @@ namespace Umbraco.Web pathPart = pathPart.EnsureEndsWith('/'); } - // return true if url starts with an element of the reserved list + // return true if URL starts with an element of the reserved list return _reservedList.Any(x => pathPart.InvariantStartsWith(x)); } diff --git a/src/Umbraco.Web/Routing/AliasUrlProvider.cs b/src/Umbraco.Web/Routing/AliasUrlProvider.cs index f84ac608d2..b3b56a18e7 100644 --- a/src/Umbraco.Web/Routing/AliasUrlProvider.cs +++ b/src/Umbraco.Web/Routing/AliasUrlProvider.cs @@ -9,7 +9,7 @@ using Umbraco.Core.Models.PublishedContent; namespace Umbraco.Web.Routing { /// - /// Provides urls using the umbracoUrlAlias property. + /// Provides URLs using the umbracoUrlAlias property. /// public class AliasUrlProvider : IUrlProvider { @@ -41,15 +41,15 @@ namespace Umbraco.Web.Routing #region GetOtherUrls /// - /// Gets the other urls of a published content. + /// Gets the other URLs of a published content. /// /// The Umbraco context. /// The published content id. - /// The current absolute url. - /// The other urls for the published content. + /// The current absolute URL. + /// The other URLs for the published content. /// - /// Other urls are those that GetUrl would not return in the current context, but would be valid - /// urls for the node in other contexts (different domain for current request, umbracoUrlAlias...). + /// Other URLs are those that GetUrl would not return in the current context, but would be valid + /// URLs for the node in other contexts (different domain for current request, umbracoUrlAlias...). /// public IEnumerable GetOtherUrls(UmbracoContext umbracoContext, int id, Uri current) { @@ -76,7 +76,7 @@ namespace Umbraco.Web.Routing if (domainUris == null) { // no domain - // if the property is invariant, then url "/" is ok + // if the property is invariant, then URL "/" is ok // if the property varies, then what are we supposed to do? // the content finder may work, depending on the 'current' culture, // but there's no way we can return something meaningful here @@ -98,11 +98,11 @@ namespace Umbraco.Web.Routing } else { - // some domains: one url per domain, which is "/" - foreach(var domainUri in domainUris) + // some domains: one URL per domain, which is "/" + foreach (var domainUri in domainUris) { - // if the property is invariant, get the invariant value, url is "/" - // if the property varies, get the variant value, url is "/" + // if the property is invariant, get the invariant value, URL is "/" + // if the property varies, get the variant value, URL is "/" // but! only if the culture is published, else ignore if (varies && !node.HasCulture(domainUri.Culture.Name)) continue; diff --git a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs index 46e44dc5a3..2781eed37d 100644 --- a/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs +++ b/src/Umbraco.Web/Routing/ContentFinderByRedirectUrl.cs @@ -7,7 +7,7 @@ using Umbraco.Core.Services; namespace Umbraco.Web.Routing { /// - /// Provides an implementation of that handles page url rewrites + /// Provides an implementation of that handles page URL rewrites /// that are stored when moving, saving, or deleting a node. /// /// @@ -48,14 +48,14 @@ namespace Umbraco.Web.Routing var url = content == null ? "#" : content.Url(redirectUrl.Culture); if (url.StartsWith("#")) { - _logger.Debug("Route {Route} matches content {ContentId} which has no url.", route, redirectUrl.ContentId); + _logger.Debug("Route {Route} matches content {ContentId} which has no URL.", route, redirectUrl.ContentId); return false; } - // Appending any querystring from the incoming request to the redirect url. + // Appending any querystring from the incoming request to the redirect URL url = string.IsNullOrEmpty(frequest.Uri.Query) ? url : url + frequest.Uri.Query; - _logger.Debug("Route {Route} matches content {ContentId} with url '{Url}', redirecting.", route, content.Id, url); + _logger.Debug("Route {Route} matches content {ContentId} with URL '{Url}', redirecting.", route, content.Id, url); frequest.SetRedirectPermanent(url); diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrl.cs b/src/Umbraco.Web/Routing/ContentFinderByUrl.cs index 0a14dc97fe..074193417a 100644 --- a/src/Umbraco.Web/Routing/ContentFinderByUrl.cs +++ b/src/Umbraco.Web/Routing/ContentFinderByUrl.cs @@ -5,10 +5,10 @@ using Umbraco.Core.Models.PublishedContent; namespace Umbraco.Web.Routing { /// - /// Provides an implementation of that handles page nice urls. + /// Provides an implementation of that handles page nice URLs. /// /// - /// Handles /foo/bar where /foo/bar is the nice url of a document. + /// Handles /foo/bar where /foo/bar is the nice URL of a document. /// public class ContentFinderByUrl : IContentFinder { diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs index cf71611047..9340c6c6de 100644 --- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs +++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs @@ -96,7 +96,7 @@ namespace Umbraco.Web.Routing } // TODO: even with Linq, what happens below has to be horribly slow - // but the only solution is to entirely refactor url providers to stop being dynamic + // but the only solution is to entirely refactor URL providers to stop being dynamic if (rootNodeId > 0) { diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs index 16dfa63596..a02ebbb2a8 100644 --- a/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs +++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAndTemplate.cs @@ -9,11 +9,11 @@ using Umbraco.Core.Services; namespace Umbraco.Web.Routing { /// - /// Provides an implementation of that handles page nice urls and a template. + /// Provides an implementation of that handles page nice URLs and a template. /// /// /// This finder allows for an odd routing pattern similar to altTemplate, probably only use case is if there is an alternative mime type template and it should be routable by something like "/hello/world/json" where the JSON template is to be used for the "world" page - /// Handles /foo/bar/template where /foo/bar is the nice url of a document, and template a template alias. + /// Handles /foo/bar/template where /foo/bar is the nice URL of a document, and template a template alias. /// If successful, then the template of the document request is also assigned. /// public class ContentFinderByUrlAndTemplate : ContentFinderByUrl diff --git a/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs index 89abde0576..48d173816d 100644 --- a/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs +++ b/src/Umbraco.Web/Routing/DefaultMediaUrlProvider.cs @@ -6,7 +6,7 @@ using Umbraco.Core.PropertyEditors; namespace Umbraco.Web.Routing { /// - /// Default media url provider. + /// Default media URL provider. /// public class DefaultMediaUrlProvider : IMediaUrlProvider { diff --git a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs index 4092538481..291ac67882 100644 --- a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs +++ b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs @@ -31,7 +31,7 @@ namespace Umbraco.Web.Routing /// public virtual UrlInfo GetUrl(UmbracoContext umbracoContext, IPublishedContent content, UrlMode mode, string culture, Uri current) { - if (!current.IsAbsoluteUri) throw new ArgumentException("Current url must be absolute.", nameof(current)); + if (!current.IsAbsoluteUri) throw new ArgumentException("Current URL must be absolute.", nameof(current)); // will not use cache if previewing var route = umbracoContext.Content.GetRouteById(content.Id, culture); @@ -55,7 +55,7 @@ namespace Umbraco.Web.Routing ? null : DomainUtilities.DomainForNode(umbracoContext.PublishedSnapshot.Domains, _siteDomainHelper, int.Parse(route.Substring(0, pos)), current, culture); - // assemble the url from domainUri (maybe null) and path + // assemble the URL from domainUri (maybe null) and path var url = AssembleUrl(domainUri, path, current, mode).ToString(); return UrlInfo.Url(url, culture); @@ -66,15 +66,15 @@ namespace Umbraco.Web.Routing #region GetOtherUrls /// - /// Gets the other urls of a published content. + /// Gets the other URLs of a published content. /// /// The Umbraco context. /// The published content id. - /// The current absolute url. - /// The other urls for the published content. + /// The current absolute URL. + /// The other URLs for the published content. /// - /// Other urls are those that GetUrl would not return in the current context, but would be valid - /// urls for the node in other contexts (different domain for current request, umbracoUrlAlias...). + /// Other URLs are those that GetUrl would not return in the current context, but would be valid + /// URLs for the node in other contexts (different domain for current request, umbracoUrlAlias...). /// public virtual IEnumerable GetOtherUrls(UmbracoContext umbracoContext, int id, Uri current) { @@ -166,7 +166,7 @@ namespace Umbraco.Web.Routing } // UriFromUmbraco will handle vdir - // meaning it will add vdir into domain urls too! + // meaning it will add vdir into domain URLs too! return UriUtility.UriFromUmbraco(uri, _globalSettings, _requestSettings); } diff --git a/src/Umbraco.Web/Routing/IMediaUrlProvider.cs b/src/Umbraco.Web/Routing/IMediaUrlProvider.cs index 8a81b27415..efb005907d 100644 --- a/src/Umbraco.Web/Routing/IMediaUrlProvider.cs +++ b/src/Umbraco.Web/Routing/IMediaUrlProvider.cs @@ -4,27 +4,27 @@ using Umbraco.Core.Models.PublishedContent; namespace Umbraco.Web.Routing { /// - /// Provides media urls. + /// Provides media URL. /// public interface IMediaUrlProvider { /// - /// Gets the url of a media item. + /// Gets the URL of a media item. /// /// The Umbraco context. /// The published content. - /// The property alias to resolve the url from. - /// The url mode. + /// The property alias to resolve the URL from. + /// The URL mode. /// The variation language. - /// The current absolute url. - /// The url for the media. + /// The current absolute URL. + /// The URL for the media. /// - /// The url is absolute or relative depending on mode and on current. - /// If the media is multi-lingual, gets the url for the specified culture or, + /// The URL is absolute or relative depending on mode and on current. + /// If the media is multi-lingual, gets the URL for the specified culture or, /// when no culture is specified, the current culture. - /// The url provider can ignore the mode and always return an absolute url, - /// e.g. a cdn url provider will most likely always return an absolute url. - /// If the provider is unable to provide a url, it returns null. + /// The URL provider can ignore the mode and always return an absolute URL, + /// e.g. a cdn URL provider will most likely always return an absolute URL. + /// If the provider is unable to provide a URL, it returns null. /// UrlInfo GetMediaUrl(UmbracoContext umbracoContext, IPublishedContent content, string propertyAlias, UrlMode mode, string culture, Uri current); } diff --git a/src/Umbraco.Web/Routing/IUrlProvider.cs b/src/Umbraco.Web/Routing/IUrlProvider.cs index c0ce1fef39..e7d5628fd0 100644 --- a/src/Umbraco.Web/Routing/IUrlProvider.cs +++ b/src/Umbraco.Web/Routing/IUrlProvider.cs @@ -5,37 +5,37 @@ using Umbraco.Core.Models.PublishedContent; namespace Umbraco.Web.Routing { /// - /// Provides urls. + /// Provides URLs. /// public interface IUrlProvider { /// - /// Gets the url of a published content. + /// Gets the URL of a published content. /// /// The Umbraco context. /// The published content. - /// The url mode. + /// The URL mode. /// A culture. - /// The current absolute url. - /// The url for the published content. + /// The current absolute URL. + /// The URL for the published content. /// - /// The url is absolute or relative depending on mode and on current. - /// If the published content is multi-lingual, gets the url for the specified culture or, + /// The URL is absolute or relative depending on mode and on current. + /// If the published content is multi-lingual, gets the URL for the specified culture or, /// when no culture is specified, the current culture. - /// If the provider is unable to provide a url, it should return null. + /// If the provider is unable to provide a URL, it should return null. /// UrlInfo GetUrl(UmbracoContext umbracoContext, IPublishedContent content, UrlMode mode, string culture, Uri current); /// - /// Gets the other urls of a published content. + /// Gets the other URLs of a published content. /// /// The Umbraco context. /// The published content id. - /// The current absolute url. - /// The other urls for the published content. + /// The current absolute URL. + /// The other URLs for the published content. /// - /// Other urls are those that GetUrl would not return in the current context, but would be valid - /// urls for the node in other contexts (different domain for current request, umbracoUrlAlias...). + /// Other URLs are those that GetUrl would not return in the current context, but would be valid + /// URLs for the node in other contexts (different domain for current request, umbracoUrlAlias...). /// IEnumerable GetOtherUrls(UmbracoContext umbracoContext, int id, Uri current); } diff --git a/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs b/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs index e1f9022f27..0045cf33dc 100644 --- a/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs +++ b/src/Umbraco.Web/Routing/PublishedContentNotFoundHandler.cs @@ -30,11 +30,11 @@ namespace Umbraco.Web.Routing response.Clear(); var frequest = Current.UmbracoContext.PublishedRequest; - var reason = "Cannot render the page at url '{0}'."; + var reason = "Cannot render the page at URL '{0}'."; if (frequest.HasPublishedContent == false) - reason = "No umbraco document matches the url '{0}'."; + reason = "No umbraco document matches the URL '{0}'."; else if (frequest.HasTemplate == false) - reason = "No template exists to render the document at url '{0}'."; + reason = "No template exists to render the document at URL '{0}'."; response.Write("

Page not found

"); response.Write("

"); diff --git a/src/Umbraco.Web/Routing/PublishedRequest.cs b/src/Umbraco.Web/Routing/PublishedRequest.cs index aee7ba4de8..959f96acc0 100644 --- a/src/Umbraco.Web/Routing/PublishedRequest.cs +++ b/src/Umbraco.Web/Routing/PublishedRequest.cs @@ -369,14 +369,14 @@ namespace Umbraco.Web.Routing public bool IsRedirectPermanent { get; private set; } /// - /// Gets or sets the url to redirect to, when the content request triggers a redirect. + /// Gets or sets the URL to redirect to, when the content request triggers a redirect. /// public string RedirectUrl { get; private set; } /// /// Indicates that the content request should trigger a redirect (302). /// - /// The url to redirect to. + /// The URL to redirect to. /// Does not actually perform a redirect, only registers that the response should /// redirect. Redirect will or will not take place in due time. public void SetRedirect(string url) @@ -389,7 +389,7 @@ namespace Umbraco.Web.Routing /// /// Indicates that the content request should trigger a permanent redirect (301). /// - /// The url to redirect to. + /// The URL to redirect to. /// Does not actually perform a redirect, only registers that the response should /// redirect. Redirect will or will not take place in due time. public void SetRedirectPermanent(string url) @@ -402,7 +402,7 @@ namespace Umbraco.Web.Routing /// /// Indicates that the content request should trigger a redirect, with a specified status code. /// - /// The url to redirect to. + /// The URL to redirect to. /// The status code (300-308). /// Does not actually perform a redirect, only registers that the response should /// redirect. Redirect will or will not take place in due time. diff --git a/src/Umbraco.Web/Routing/PublishedRouter.cs b/src/Umbraco.Web/Routing/PublishedRouter.cs index 6e768c28b6..fee9a62158 100644 --- a/src/Umbraco.Web/Routing/PublishedRouter.cs +++ b/src/Umbraco.Web/Routing/PublishedRouter.cs @@ -96,7 +96,7 @@ namespace Umbraco.Web.Routing { // note - at that point the original legacy module did something do handle IIS custom 404 errors // ie pages looking like /anything.aspx?404;/path/to/document - I guess the reason was to support - // "directory urls" without having to do wildcard mapping to ASP.NET on old IIS. This is a pain + // "directory URLs" without having to do wildcard mapping to ASP.NET on old IIS. This is a pain // to maintain and probably not used anymore - removed as of 06/2012. @zpqrtbnk. // // to trigger Umbraco's not-found, one should configure IIS and/or ASP.NET custom 404 errors diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs index 490fade3c6..c12d735a60 100644 --- a/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs +++ b/src/Umbraco.Web/Routing/RedirectTrackingComponent.cs @@ -11,8 +11,8 @@ using Umbraco.Web.PublishedCache; namespace Umbraco.Web.Routing { - /// Implements an Application Event Handler for managing redirect urls tracking. - /// when content is renamed or moved, we want to create a permanent 301 redirect from it's old url + /// Implements an Application Event Handler for managing redirect URLs tracking. + /// when content is renamed or moved, we want to create a permanent 301 redirect from it's old URL /// /// not managing domains because we don't know how to do it - changing domains => must create a higher level /// strategy using rewriting rules probably diff --git a/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs b/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs index bcafc8d050..a58c7c5679 100644 --- a/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs +++ b/src/Umbraco.Web/Routing/RedirectTrackingComposer.cs @@ -4,10 +4,10 @@ using Umbraco.Core.Composing; namespace Umbraco.Web.Routing { /// - /// Implements an Application Event Handler for managing redirect urls tracking. + /// Implements an Application Event Handler for managing redirect URLs tracking. /// /// - /// when content is renamed or moved, we want to create a permanent 301 redirect from it's old url + /// when content is renamed or moved, we want to create a permanent 301 redirect from it's old URL /// not managing domains because we don't know how to do it - changing domains => must create a higher level strategy using rewriting rules probably /// recycle bin = moving to and from does nothing: to = the node is gone, where would we redirect? from = same /// diff --git a/src/Umbraco.Web/Routing/UrlInfo.cs b/src/Umbraco.Web/Routing/UrlInfo.cs index 8385ab54a9..59145d19ec 100644 --- a/src/Umbraco.Web/Routing/UrlInfo.cs +++ b/src/Umbraco.Web/Routing/UrlInfo.cs @@ -4,14 +4,14 @@ using System.Runtime.Serialization; namespace Umbraco.Web.Routing { /// - /// Represents infos for a url. + /// Represents infos for a URL. /// [DataContract(Name = "urlInfo", Namespace = "")] public class UrlInfo : IEquatable { /// - /// Creates a instance representing a true url. + /// Creates a instance representing a true URL. /// public static UrlInfo Url(string text, string culture = null) => new UrlInfo(text, true, culture); @@ -38,14 +38,14 @@ namespace Umbraco.Web.Routing public string Culture { get; } /// - /// Gets a value indicating whether the url is a true url. + /// Gets a value indicating whether the URL is a true URL. /// /// Otherwise, it is a message. [DataMember(Name = "isUrl")] public bool IsUrl { get; } /// - /// Gets the text, which is either the url, or a message. + /// Gets the text, which is either the URL, or a message. /// [DataMember(Name = "text")] public string Text { get; } diff --git a/src/Umbraco.Web/Routing/UrlProvider.cs b/src/Umbraco.Web/Routing/UrlProvider.cs index d42639b781..5ab4e06c5e 100644 --- a/src/Umbraco.Web/Routing/UrlProvider.cs +++ b/src/Umbraco.Web/Routing/UrlProvider.cs @@ -9,19 +9,19 @@ using Umbraco.Web.Composing; namespace Umbraco.Web.Routing { /// - /// Provides urls. + /// Provides URLs. /// public class UrlProvider { #region Ctor and configuration /// - /// Initializes a new instance of the class with an Umbraco context and a list of url providers. + /// Initializes a new instance of the class with an Umbraco context and a list of URL providers. /// /// The Umbraco context. /// Routing settings. - /// The list of url providers. - /// The list of media url providers. + /// The list of URL providers. + /// The list of media URL providers. /// The current variation accessor. public UrlProvider(UmbracoContext umbracoContext, IWebRoutingSection routingSettings, IEnumerable urlProviders, IEnumerable mediaUrlProviders, IVariationContextAccessor variationContextAccessor) { @@ -41,11 +41,11 @@ namespace Umbraco.Web.Routing } /// - /// Initializes a new instance of the class with an Umbraco context and a list of url providers. + /// Initializes a new instance of the class with an Umbraco context and a list of URL providers. /// /// The Umbraco context. - /// The list of url providers. - /// The list of media url providers + /// The list of URL providers. + /// The list of media URL providers /// The current variation accessor. /// An optional provider mode. public UrlProvider(UmbracoContext umbracoContext, IEnumerable urlProviders, IEnumerable mediaUrlProviders, IVariationContextAccessor variationContextAccessor, UrlMode mode = UrlMode.Auto) @@ -64,7 +64,7 @@ namespace Umbraco.Web.Routing private readonly IVariationContextAccessor _variationContextAccessor; /// - /// Gets or sets the provider url mode. + /// Gets or sets the provider URL mode. /// public UrlMode Mode { get; set; } @@ -78,40 +78,40 @@ namespace Umbraco.Web.Routing private IPublishedContent GetMedia(Guid id) => _umbracoContext.Media.GetById(id); /// - /// Gets the url of a published content. + /// Gets the URL of a published content. /// /// The published content identifier. - /// The url mode. + /// The URL mode. /// A culture. - /// The current absolute url. - /// The url for the published content. + /// The current absolute URL. + /// The URL for the published content. public string GetUrl(Guid id, UrlMode mode = UrlMode.Default, string culture = null, Uri current = null) => GetUrl(GetDocument(id), mode, culture, current); /// - /// Gets the url of a published content. + /// Gets the URL of a published content. /// /// The published content identifier. - /// The url mode. + /// The URL mode. /// A culture. - /// The current absolute url. - /// The url for the published content. + /// The current absolute URL. + /// The URL for the published content. public string GetUrl(int id, UrlMode mode = UrlMode.Default, string culture = null, Uri current = null) => GetUrl(GetDocument(id), mode, culture, current); /// - /// Gets the url of a published content. + /// Gets the URL of a published content. /// /// The published content. - /// The url mode. + /// The URL mode. /// A culture. - /// The current absolute url. - /// The url for the published content. + /// The current absolute URL. + /// The URL for the published content. /// - /// The url is absolute or relative depending on mode and on current. - /// If the published content is multi-lingual, gets the url for the specified culture or, + /// The URL is absolute or relative depending on mode and on current. + /// If the published content is multi-lingual, gets the URL for the specified culture or, /// when no culture is specified, the current culture. - /// If the provider is unable to provide a url, it returns "#". + /// If the provider is unable to provide a URL, it returns "#". /// public string GetUrl(IPublishedContent content, UrlMode mode = UrlMode.Default, string culture = null, Uri current = null) { @@ -152,14 +152,14 @@ namespace Umbraco.Web.Routing #region GetOtherUrls /// - /// Gets the other urls of a published content. + /// Gets the other URLs of a published content. /// /// The published content id. - /// The other urls for the published content. + /// The other URLs for the published content. /// - /// Other urls are those that GetUrl would not return in the current context, but would be valid - /// urls for the node in other contexts (different domain for current request, umbracoUrlAlias...). - /// The results depend on the current url. + /// Other URLs are those that GetUrl would not return in the current context, but would be valid + /// URLs for the node in other contexts (different domain for current request, umbracoUrlAlias...). + /// The results depend on the current URL. /// public IEnumerable GetOtherUrls(int id) { @@ -167,14 +167,14 @@ namespace Umbraco.Web.Routing } /// - /// Gets the other urls of a published content. + /// Gets the other URLs of a published content. /// /// The published content id. - /// The current absolute url. - /// The other urls for the published content. + /// The current absolute URL. + /// The other URLs for the published content. /// - /// Other urls are those that GetUrl would not return in the current context, but would be valid - /// urls for the node in other contexts (different domain for current request, umbracoUrlAlias...). + /// Other URLs are those that GetUrl would not return in the current context, but would be valid + /// URLs for the node in other contexts (different domain for current request, umbracoUrlAlias...). /// public IEnumerable GetOtherUrls(int id, Uri current) { @@ -186,7 +186,7 @@ namespace Umbraco.Web.Routing #region GetMediaUrl /// - /// Gets the url of a media item. + /// Gets the URL of a media item. /// /// /// @@ -198,19 +198,19 @@ namespace Umbraco.Web.Routing => GetMediaUrl(GetMedia(id), mode, culture, propertyAlias, current); /// - /// Gets the url of a media item. + /// Gets the URL of a media item. /// /// The published content. - /// The property alias to resolve the url from. - /// The url mode. + /// The property alias to resolve the URL from. + /// The URL mode. /// The variation language. - /// The current absolute url. - /// The url for the media. + /// The current absolute URL. + /// The URL for the media. /// - /// The url is absolute or relative depending on mode and on current. - /// If the media is multi-lingual, gets the url for the specified culture or, + /// The URL is absolute or relative depending on mode and on current. + /// If the media is multi-lingual, gets the URL for the specified culture or, /// when no culture is specified, the current culture. - /// If the provider is unable to provide a url, it returns . + /// If the provider is unable to provide a URL, it returns . /// public string GetMediaUrl(IPublishedContent content, UrlMode mode = UrlMode.Default, string culture = null, string propertyAlias = Constants.Conventions.Media.File, Uri current = null) { diff --git a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs index 077680d2e2..afa0bc96cc 100644 --- a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs +++ b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs @@ -11,11 +11,11 @@ namespace Umbraco.Web.Routing internal static class UrlProviderExtensions { /// - /// Gets the Urls of the content item. + /// Gets the URLs of the content item. /// /// - /// Use when displaying Urls. If errors occur when generating the Urls, they will show in the list. - /// Contains all the Urls that we can figure out (based upon domains, etc). + /// Use when displaying URLs. If errors occur when generating the URLs, they will show in the list. + /// Contains all the URLs that we can figure out (based upon domains, etc). /// public static IEnumerable GetContentUrls(this IContent content, IPublishedRouter publishedRouter, @@ -39,13 +39,13 @@ namespace Umbraco.Web.Routing yield break; } - // build a list of urls, for the back-office + // build a list of URLs, for the back-office // which will contain - // - the 'main' urls, which is what .Url would return, for each culture - // - the 'other' urls we know (based upon domains, etc) + // - the 'main' URLs, which is what .Url would return, for each culture + // - the 'other' URLs we know (based upon domains, etc) // // need to work through each installed culture: - // on invariant nodes, each culture returns the same url segment but, + // on invariant nodes, each culture returns the same URL segment but, // we don't know if the branch to this content is invariant, so we need to ask // for URLs for all cultures. // and, not only for those assigned to domains in the branch, because we want @@ -61,7 +61,7 @@ namespace Umbraco.Web.Routing urls.Add(cultureUrl); } - //return the real urls first, then the messages + //return the real URLs first, then the messages foreach (var urlGroup in urls.GroupBy(x => x.IsUrl).OrderByDescending(x => x.Key)) { //in some cases there will be the same URL for multiple cultures: @@ -72,8 +72,8 @@ namespace Umbraco.Web.Routing yield return dUrl; } - // get the 'other' urls - ie not what you'd get with GetUrl() but urls that would route to the document, nevertheless. - // for these 'other' urls, we don't check whether they are routable, collide, anything - we just report them. + // get the 'other' URLs - ie not what you'd get with GetUrl() but URLs that would route to the document, nevertheless. + // for these 'other' URLs, we don't check whether they are routable, collide, anything - we just report them. foreach (var otherUrl in umbracoContext.UrlProvider.GetOtherUrls(content.Id).OrderBy(x => x.Text).ThenBy(x => x.Culture)) if (urls.Add(otherUrl)) //avoid duplicates yield return otherUrl; @@ -119,7 +119,7 @@ namespace Umbraco.Web.Routing switch (url) { - // deal with 'could not get the url' + // deal with 'could not get the URL' case "#": yield return HandleCouldNotGetUrl(content, culture, contentService, textService); break; @@ -129,7 +129,7 @@ namespace Umbraco.Web.Routing yield return UrlInfo.Message(textService.Localize("content/getUrlException"), culture); break; - // got a url, deal with collisions, add url + // got a URL, deal with collisions, add URL default: if (DetectCollision(content, url, culture, umbracoContext, publishedRouter, textService, out var urlInfo)) // detect collisions, etc yield return urlInfo; @@ -142,7 +142,7 @@ namespace Umbraco.Web.Routing private static UrlInfo HandleCouldNotGetUrl(IContent content, string culture, IContentService contentService, ILocalizedTextService textService) { - // document has a published version yet its url is "#" => a parent must be + // document has a published version yet its URL is "#" => a parent must be // unpublished, walk up the tree until we find it, and report. var parent = content; do @@ -163,7 +163,7 @@ namespace Umbraco.Web.Routing private static bool DetectCollision(IContent content, string url, string culture, UmbracoContext umbracoContext, IPublishedRouter publishedRouter, ILocalizedTextService textService, out UrlInfo urlInfo) { - // test for collisions on the 'main' url + // test for collisions on the 'main' URL var uri = new Uri(url.TrimEnd('/'), UriKind.RelativeOrAbsolute); if (uri.IsAbsoluteUri == false) uri = uri.MakeAbsolute(umbracoContext.CleanedUmbracoUrl); uri = UriUtility.UriToUmbraco(uri); diff --git a/src/Umbraco.Web/Runtime/WebInitialComponent.cs b/src/Umbraco.Web/Runtime/WebInitialComponent.cs index ac813d7196..ee4bb86273 100644 --- a/src/Umbraco.Web/Runtime/WebInitialComponent.cs +++ b/src/Umbraco.Web/Runtime/WebInitialComponent.cs @@ -129,7 +129,7 @@ namespace Umbraco.Web.Runtime if (ConfigurationManager.GetSection("system.web/httpRuntime") is HttpRuntimeSection section) { - //set the max url length for CDF to be the smallest of the max query length, max request length + //set the max URL length for CDF to be the smallest of the max query length, max request length ClientDependency.Core.CompositeFiles.CompositeDependencyHandler.MaxHandlerUrlLength = Math.Min(section.MaxQueryStringLength, section.MaxRequestLength); } @@ -208,7 +208,7 @@ namespace Umbraco.Web.Runtime var url = umbracoPath + (meta.IsBackOffice ? "/BackOffice" : "") + "/Api/" + meta.ControllerName + "/{action}/{id}"; var route = RouteTable.Routes.MapHttpRoute( $"umbraco-api-{meta.ControllerName}", - url, // url to match + url, // URL to match new { controller = meta.ControllerName, id = UrlParameter.Optional }, new[] { meta.ControllerNamespace }); if (route.DataTokens == null) // web api routes don't set the data tokens object @@ -222,7 +222,7 @@ namespace Umbraco.Web.Runtime var url = umbracoPath + "/Surface/" + meta.ControllerName + "/{action}/{id}"; var route = RouteTable.Routes.MapRoute( $"umbraco-surface-{meta.ControllerName}", - url, // url to match + url, // URL to match new { controller = meta.ControllerName, action = "Index", id = UrlParameter.Optional }, new[] { meta.ControllerNamespace }); // look in this namespace to create the controller route.DataTokens.Add(Core.Constants.Web.UmbracoDataToken, "surface"); // ensure the umbraco token is set diff --git a/src/Umbraco.Web/Templates/HtmlImageSourceParser.cs b/src/Umbraco.Web/Templates/HtmlImageSourceParser.cs index 539ce303fd..4fa77be77f 100644 --- a/src/Umbraco.Web/Templates/HtmlImageSourceParser.cs +++ b/src/Umbraco.Web/Templates/HtmlImageSourceParser.cs @@ -82,7 +82,7 @@ namespace Umbraco.Web.Templates } /// - /// Removes media urls from <img> tags where a data-udi attribute is present + /// Removes media URLs from <img> tags where a data-udi attribute is present /// /// /// diff --git a/src/Umbraco.Web/Templates/HtmlLocalLinkParser.cs b/src/Umbraco.Web/Templates/HtmlLocalLinkParser.cs index f65a7183b7..391614e68e 100644 --- a/src/Umbraco.Web/Templates/HtmlLocalLinkParser.cs +++ b/src/Umbraco.Web/Templates/HtmlLocalLinkParser.cs @@ -47,7 +47,7 @@ namespace Umbraco.Web.Templates if (!preview) return EnsureInternalLinks(text); - using (_umbracoContextAccessor.UmbracoContext.ForcedPreview(preview)) // force for url provider + using (_umbracoContextAccessor.UmbracoContext.ForcedPreview(preview)) // force for URL provider { return EnsureInternalLinks(text); } diff --git a/src/Umbraco.Web/Templates/HtmlUrlParser.cs b/src/Umbraco.Web/Templates/HtmlUrlParser.cs index 5b78477579..0692b75fa7 100644 --- a/src/Umbraco.Web/Templates/HtmlUrlParser.cs +++ b/src/Umbraco.Web/Templates/HtmlUrlParser.cs @@ -34,7 +34,7 @@ namespace Umbraco.Web.Templates using (var timer = _logger.DebugDuration(typeof(IOHelper), "ResolveUrlsFromTextString starting", "ResolveUrlsFromTextString complete")) { - // find all relative urls (ie. urls that contain ~) + // find all relative URLs (ie. URLs that contain ~) var tags = ResolveUrlPattern.Matches(text); _logger.Debug(typeof(IOHelper), "After regex: {Duration} matched: {TagsCount}", timer.Stopwatch.ElapsedMilliseconds, tags.Count); foreach (Match tag in tags) @@ -43,7 +43,7 @@ namespace Umbraco.Web.Templates if (tag.Groups[1].Success) url = tag.Groups[1].Value; - // The richtext editor inserts a slash in front of the url. That's why we need this little fix + // The richtext editor inserts a slash in front of the URL. That's why we need this little fix // if (url.StartsWith("/")) // text = text.Replace(url, ResolveUrl(url.Substring(1))); // else diff --git a/src/Umbraco.Web/Templates/TemplateRenderer.cs b/src/Umbraco.Web/Templates/TemplateRenderer.cs index 4602942be1..127dc6033a 100644 --- a/src/Umbraco.Web/Templates/TemplateRenderer.cs +++ b/src/Umbraco.Web/Templates/TemplateRenderer.cs @@ -45,7 +45,7 @@ namespace Umbraco.Web.Templates if (writer == null) throw new ArgumentNullException(nameof(writer)); // instantiate a request and process - // important to use CleanedUmbracoUrl - lowercase path-only version of the current url, though this isn't going to matter + // important to use CleanedUmbracoUrl - lowercase path-only version of the current URL, though this isn't going to matter // terribly much for this implementation since we are just creating a doc content request to modify it's properties manually. var contentRequest = _publishedRouter.CreateRequest(_umbracoContextAccessor.UmbracoContext); diff --git a/src/Umbraco.Web/Templates/TemplateUtilities.cs b/src/Umbraco.Web/Templates/TemplateUtilities.cs index f08abfaf12..105d3e0812 100644 --- a/src/Umbraco.Web/Templates/TemplateUtilities.cs +++ b/src/Umbraco.Web/Templates/TemplateUtilities.cs @@ -22,7 +22,7 @@ namespace Umbraco.Web.Templates [Obsolete("Inject and use an instance of " + nameof(HtmlLocalLinkParser) + " instead")] internal static string ParseInternalLinks(string text, bool preview, UmbracoContext umbracoContext) { - using (umbracoContext.ForcedPreview(preview)) // force for url provider + using (umbracoContext.ForcedPreview(preview)) // force for URL provider { text = ParseInternalLinks(text, umbracoContext.UrlProvider); } diff --git a/src/Umbraco.Web/Trees/DictionaryTreeController.cs b/src/Umbraco.Web/Trees/DictionaryTreeController.cs index 3f7b89bcdf..f21f0b2868 100644 --- a/src/Umbraco.Web/Trees/DictionaryTreeController.cs +++ b/src/Umbraco.Web/Trees/DictionaryTreeController.cs @@ -72,7 +72,7 @@ namespace Umbraco.Web.Trees } else { - // maybe we should use the guid as url param to avoid the extra call for getting dictionary item + // maybe we should use the guid as URL param to avoid the extra call for getting dictionary item var parentDictionary = Services.LocalizationService.GetDictionaryItemById(intId.Result); if (parentDictionary == null) return nodes; diff --git a/src/Umbraco.Web/Trees/TreeControllerBase.cs b/src/Umbraco.Web/Trees/TreeControllerBase.cs index 77e5ebef62..f618d053ac 100644 --- a/src/Umbraco.Web/Trees/TreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/TreeControllerBase.cs @@ -250,7 +250,7 @@ namespace Umbraco.Web.Trees } /// - /// Helper method to create tree nodes and automatically generate the json url + UDI + /// Helper method to create tree nodes and automatically generate the json URL + UDI /// /// /// @@ -270,7 +270,7 @@ namespace Umbraco.Web.Trees } /// - /// Helper method to create tree nodes and automatically generate the json url + UDI + /// Helper method to create tree nodes and automatically generate the json URL + UDI /// /// /// @@ -289,7 +289,7 @@ namespace Umbraco.Web.Trees } /// - /// Helper method to create tree nodes and automatically generate the json url + /// Helper method to create tree nodes and automatically generate the json URL /// /// /// @@ -306,7 +306,7 @@ namespace Umbraco.Web.Trees } /// - /// Helper method to create tree nodes and automatically generate the json url + /// Helper method to create tree nodes and automatically generate the json URL /// /// /// @@ -325,7 +325,7 @@ namespace Umbraco.Web.Trees } /// - /// Helper method to create tree nodes and automatically generate the json url + UDI + /// Helper method to create tree nodes and automatically generate the json URL + UDI /// /// /// diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs index 347f79e51b..ab8470c64f 100644 --- a/src/Umbraco.Web/UmbracoContext.cs +++ b/src/Umbraco.Web/UmbracoContext.cs @@ -66,7 +66,7 @@ namespace Umbraco.Web // beware - we cannot expect a current user here, so detecting preview mode must be a lazy thing _publishedSnapshot = new Lazy(() => publishedSnapshotService.CreatePublishedSnapshot(PreviewToken)); - // set the urls... + // set the URLs... // NOTE: The request will not be available during app startup so we can only set this to an absolute URL of localhost, this // is a work around to being able to access the UmbracoContext during application startup and this will also ensure that people // 'could' still generate URLs during startup BUT any domain driven URL generation will not work because it is NOT possible to get @@ -101,7 +101,7 @@ namespace Umbraco.Web internal Uri OriginalRequestUrl { get; } /// - /// Gets the cleaned up url that is handled by Umbraco. + /// Gets the cleaned up URL that is handled by Umbraco. /// /// That is, lowercase, no trailing slash after path, no .aspx... internal Uri CleanedUmbracoUrl { get; } @@ -144,7 +144,7 @@ namespace Umbraco.Web public bool IsFrontEndUmbracoRequest => PublishedRequest != null; /// - /// Gets the url provider. + /// Gets the URL provider. /// public UrlProvider UrlProvider { get; } @@ -197,57 +197,57 @@ namespace Umbraco.Web #region Urls /// - /// Gets the url of a content identified by its identifier. + /// Gets the URL of a content identified by its identifier. /// /// The content identifier. /// - /// The url for the content. + /// The URL for the content. public string Url(int contentId, string culture = null) { return UrlProvider.GetUrl(contentId, culture: culture); } /// - /// Gets the url of a content identified by its identifier. + /// Gets the URL of a content identified by its identifier. /// /// The content identifier. /// - /// The url for the content. + /// The URL for the content. public string Url(Guid contentId, string culture = null) { return UrlProvider.GetUrl(contentId, culture: culture); } /// - /// Gets the url of a content identified by its identifier, in a specified mode. + /// Gets the URL of a content identified by its identifier, in a specified mode. /// /// The content identifier. /// The mode. /// - /// The url for the content. + /// The URL for the content. public string Url(int contentId, UrlMode mode, string culture = null) { return UrlProvider.GetUrl(contentId, mode, culture); } /// - /// Gets the url of a content identified by its identifier, in a specified mode. + /// Gets the URL of a content identified by its identifier, in a specified mode. /// /// The content identifier. /// The mode. /// - /// The url for the content. + /// The URL for the content. public string Url(Guid contentId, UrlMode mode, string culture = null) { return UrlProvider.GetUrl(contentId, mode, culture); } /// - /// Gets the absolute url of a content identified by its identifier. + /// Gets the absolute URL of a content identified by its identifier. /// /// The content identifier. /// - /// The absolute url for the content. + /// The absolute URL for the content. [Obsolete("Use the Url() method with UrlMode.Absolute.")] public string UrlAbsolute(int contentId, string culture = null) { @@ -255,11 +255,11 @@ namespace Umbraco.Web } /// - /// Gets the absolute url of a content identified by its identifier. + /// Gets the absolute URL of a content identified by its identifier. /// /// The content identifier. /// - /// The absolute url for the content. + /// The absolute URL for the content. [Obsolete("Use the Url() method with UrlMode.Absolute.")] public string UrlAbsolute(Guid contentId, string culture = null) { diff --git a/src/Umbraco.Web/UmbracoHttpHandler.cs b/src/Umbraco.Web/UmbracoHttpHandler.cs index 447bdde430..fae2b571c5 100644 --- a/src/Umbraco.Web/UmbracoHttpHandler.cs +++ b/src/Umbraco.Web/UmbracoHttpHandler.cs @@ -61,7 +61,7 @@ namespace Umbraco.Web public WebSecurity Security => UmbracoContextAccessor.UmbracoContext.Security; /// - /// Gets the Url helper. + /// Gets the URL helper. /// /// This URL helper is created without any route data and an empty request context. public UrlHelper Url => _url ?? (_url = new UrlHelper(HttpContext.Current.Request.RequestContext)); diff --git a/src/Umbraco.Web/UmbracoInjectedModule.cs b/src/Umbraco.Web/UmbracoInjectedModule.cs index 6dc41d39ee..6eeef081a2 100644 --- a/src/Umbraco.Web/UmbracoInjectedModule.cs +++ b/src/Umbraco.Web/UmbracoInjectedModule.cs @@ -62,7 +62,7 @@ namespace Umbraco.Web /// private void BeginRequest(HttpContextBase httpContext) { - // ensure application url is initialized + // ensure application URL is initialized ((RuntimeState) Current.RuntimeState).EnsureApplicationUrl(httpContext.Request); // do not process if client-side request @@ -128,7 +128,7 @@ namespace Umbraco.Web // auth. Paul Sterling confirmed in Jan. 2013 that we can get rid of it. // instantiate, prepare and process the published content request - // important to use CleanedUmbracoUrl - lowercase path-only version of the current url + // important to use CleanedUmbracoUrl - lowercase path-only version of the current URL var request = _publishedRouter.CreateRequest(umbracoContext); umbracoContext.PublishedRequest = request; _publishedRouter.PrepareRequest(request); @@ -276,7 +276,7 @@ namespace Umbraco.Web { // NOTE: we do not want to use TransferRequest even though many docs say it is better with IIS7, turns out this is // not what we need. The purpose of TransferRequest is to ensure that .net processes all of the rules for the newly - // rewritten url, but this is not what we want! + // rewritten URL, but this is not what we want! // read: http://forums.iis.net/t/1146511.aspx var query = pcr.Uri.Query.TrimStart('?'); diff --git a/src/Umbraco.Web/UmbracoWebService.cs b/src/Umbraco.Web/UmbracoWebService.cs index bccdb5771d..f7268283f5 100644 --- a/src/Umbraco.Web/UmbracoWebService.cs +++ b/src/Umbraco.Web/UmbracoWebService.cs @@ -77,7 +77,7 @@ namespace Umbraco.Web public WebSecurity Security => UmbracoContext.Security; /// - /// Gets the Url helper. + /// Gets the URL helper. /// /// This URL helper is created without any route data and an empty request context. public UrlHelper Url => _url ?? (_url = new UrlHelper(Context.Request.RequestContext)); diff --git a/src/Umbraco.Web/UriUtility.cs b/src/Umbraco.Web/UriUtility.cs index 9e94a4a20a..ae0b001917 100644 --- a/src/Umbraco.Web/UriUtility.cs +++ b/src/Umbraco.Web/UriUtility.cs @@ -227,7 +227,7 @@ namespace Umbraco.Web #endregion /// - /// Returns an full url with the host, port, etc... + /// Returns an full URL with the host, port, etc... /// /// An absolute path (i.e. starts with a '/' ) /// diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs index 7e63ff16b8..f2c954d399 100644 --- a/src/Umbraco.Web/UrlHelperExtensions.cs +++ b/src/Umbraco.Web/UrlHelperExtensions.cs @@ -20,7 +20,7 @@ namespace Umbraco.Web { /// - /// Return the Url for a Web Api service + /// Return the URL for a Web Api service /// /// /// @@ -58,7 +58,7 @@ namespace Umbraco.Web } /// - /// Return the Url for a Web Api service + /// Return the URL for a Web Api service /// /// /// @@ -87,7 +87,7 @@ namespace Umbraco.Web } /// - /// Return the Url for a Web Api service + /// Return the URL for a Web Api service /// /// /// @@ -119,7 +119,7 @@ namespace Umbraco.Web /// - /// Return the Url for an action with a cache-busting hash appended + /// Return the URL for an action with a cache-busting hash appended /// /// /// diff --git a/src/Umbraco.Web/UrlHelperRenderExtensions.cs b/src/Umbraco.Web/UrlHelperRenderExtensions.cs index 8e410bf584..0f5b0557f4 100644 --- a/src/Umbraco.Web/UrlHelperRenderExtensions.cs +++ b/src/Umbraco.Web/UrlHelperRenderExtensions.cs @@ -23,7 +23,7 @@ namespace Umbraco.Web #region GetCropUrl /// - /// Gets the ImageProcessor Url of a media item by the crop alias (using default media item property alias of "umbracoFile") + /// Gets the ImageProcessor URL of a media item by the crop alias (using default media item property alias of "umbracoFile") /// /// /// @@ -46,7 +46,7 @@ namespace Umbraco.Web } /// - /// Gets the ImageProcessor Url by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item. + /// Gets the ImageProcessor URL by the crop alias using the specified property containing the image cropper Json data on the IPublishedContent item. /// /// /// @@ -63,7 +63,7 @@ namespace Umbraco.Web /// set to false if using the result of this method for CSS. /// /// - /// The ImageProcessor.Web Url. + /// The ImageProcessor.Web URL. /// public static IHtmlString GetCropUrl(this UrlHelper urlHelper, IPublishedContent mediaItem, string propertyAlias, string cropAlias, bool htmlEncode = true) { @@ -74,7 +74,7 @@ namespace Umbraco.Web } /// - /// Gets the ImageProcessor Url from the image path. + /// Gets the ImageProcessor URL from the image path. /// /// /// The IPublishedContent item. @@ -157,10 +157,10 @@ namespace Umbraco.Web } /// - /// Gets the ImageProcessor Url from the image path. + /// Gets the ImageProcessor URL from the image path. /// /// - /// The image url. + /// The image URL. /// /// /// The width of the output image. diff --git a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs index a1cd7708e2..9e22928cf6 100644 --- a/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs +++ b/src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs @@ -125,7 +125,7 @@ namespace Umbraco.Web.WebApi internal IRuntimeState RuntimeState { get; } /// - /// Gets the application url. + /// Gets the application URL. /// protected Uri ApplicationUrl => RuntimeState.ApplicationUrl;