diff --git a/ShareX.HelpersLib/NameParser/CodeMenuEntryFilename.cs b/ShareX.HelpersLib/NameParser/CodeMenuEntryFilename.cs index 533206ab0..a87d3a77f 100644 --- a/ShareX.HelpersLib/NameParser/CodeMenuEntryFilename.cs +++ b/ShareX.HelpersLib/NameParser/CodeMenuEntryFilename.cs @@ -46,6 +46,7 @@ public class CodeMenuEntryFilename : CodeMenuEntry public static readonly CodeMenuEntryFilename pm = new CodeMenuEntryFilename("pm", Resources.ReplCodeMenuEntry_pm_Gets_AM_PM, Resources.ReplCodeMenuCategory_Date_and_Time); public static readonly CodeMenuEntryFilename w = new CodeMenuEntryFilename("w", Resources.ReplCodeMenuEntry_w_Current_week_name__Local_language_, Resources.ReplCodeMenuCategory_Date_and_Time); public static readonly CodeMenuEntryFilename w2 = new CodeMenuEntryFilename("w2", Resources.ReplCodeMenuEntry_w2_Current_week_name__English_, Resources.ReplCodeMenuCategory_Date_and_Time); + public static readonly CodeMenuEntryFilename wy = new CodeMenuEntryFilename("wy", Resources.ReplCodeMenuEntry_wy_Week_of_year, Resources.ReplCodeMenuCategory_Date_and_Time); public static readonly CodeMenuEntryFilename unix = new CodeMenuEntryFilename("unix", Resources.ReplCodeMenuEntry_unix_Unix_timestamp, Resources.ReplCodeMenuCategory_Date_and_Time); public static readonly CodeMenuEntryFilename i = new CodeMenuEntryFilename("i", Resources.ReplCodeMenuEntry_i_Auto_increment_number, Resources.ReplCodeMenuCategory_Incremental); public static readonly CodeMenuEntryFilename ia = new CodeMenuEntryFilename("ia", Resources.ReplCodeMenuEntry_ia_Auto_increment_alphanumeric, Resources.ReplCodeMenuCategory_Incremental); diff --git a/ShareX.HelpersLib/NameParser/NameParser.cs b/ShareX.HelpersLib/NameParser/NameParser.cs index 2e71b36dd..448fd3a44 100644 --- a/ShareX.HelpersLib/NameParser/NameParser.cs +++ b/ShareX.HelpersLib/NameParser/NameParser.cs @@ -141,6 +141,7 @@ public string Parse(string pattern) .Replace(CodeMenuEntryFilename.mi.ToPrefixString(), Helpers.AddZeroes(dt.Minute)) .Replace(CodeMenuEntryFilename.s.ToPrefixString(), Helpers.AddZeroes(dt.Second)) .Replace(CodeMenuEntryFilename.ms.ToPrefixString(), Helpers.AddZeroes(dt.Millisecond, 3)) + .Replace(CodeMenuEntryFilename.wy.ToPrefixString(), dt.WeekOfYear().ToString()) .Replace(CodeMenuEntryFilename.w2.ToPrefixString(), CultureInfo.InvariantCulture.DateTimeFormat.GetDayName(dt.DayOfWeek)) .Replace(CodeMenuEntryFilename.w.ToPrefixString(), CultureInfo.CurrentCulture.DateTimeFormat.GetDayName(dt.DayOfWeek)) .Replace(CodeMenuEntryFilename.pm.ToPrefixString(), dt.Hour >= 12 ? "PM" : "AM"); diff --git a/ShareX.HelpersLib/Properties/Resources.Designer.cs b/ShareX.HelpersLib/Properties/Resources.Designer.cs index 92bfae662..2b86f4d41 100644 --- a/ShareX.HelpersLib/Properties/Resources.Designer.cs +++ b/ShareX.HelpersLib/Properties/Resources.Designer.cs @@ -2575,7 +2575,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current day. + /// Looks up a localized string similar to Day. /// internal static string ReplCodeMenuEntry_d_Current_day { get { @@ -2593,7 +2593,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current hour. + /// Looks up a localized string similar to Hour. /// internal static string ReplCodeMenuEntry_h_Current_hour { get { @@ -2656,7 +2656,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current minute. + /// Looks up a localized string similar to Minute. /// internal static string ReplCodeMenuEntry_mi_Current_minute { get { @@ -2665,7 +2665,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current month. + /// Looks up a localized string similar to Month. /// internal static string ReplCodeMenuEntry_mo_Current_month { get { @@ -2674,7 +2674,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current month name (Local language). + /// Looks up a localized string similar to Month name (Local language). /// internal static string ReplCodeMenuEntry_mon_Current_month_name__Local_language_ { get { @@ -2683,7 +2683,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current month name (English). + /// Looks up a localized string similar to Month name (English). /// internal static string ReplCodeMenuEntry_mon2_Current_month_name__English_ { get { @@ -2692,7 +2692,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current millisecond. + /// Looks up a localized string similar to Millisecond. /// internal static string ReplCodeMenuEntry_ms_Current_millisecond { get { @@ -2710,7 +2710,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Gets AM/PM. + /// Looks up a localized string similar to AM/PM. /// internal static string ReplCodeMenuEntry_pm_Gets_AM_PM { get { @@ -2764,7 +2764,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current second. + /// Looks up a localized string similar to Second. /// internal static string ReplCodeMenuEntry_s_Current_second { get { @@ -2809,7 +2809,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current week name (Local language). + /// Looks up a localized string similar to Week name (Local language). /// internal static string ReplCodeMenuEntry_w_Current_week_name__Local_language_ { get { @@ -2818,7 +2818,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current week name (English). + /// Looks up a localized string similar to Week name (English). /// internal static string ReplCodeMenuEntry_w2_Current_week_name__English_ { get { @@ -2836,7 +2836,16 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current year. + /// Looks up a localized string similar to Week of year. + /// + internal static string ReplCodeMenuEntry_wy_Week_of_year { + get { + return ResourceManager.GetString("ReplCodeMenuEntry_wy_Week_of_year", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Year. /// internal static string ReplCodeMenuEntry_y_Current_year { get { @@ -2845,7 +2854,7 @@ internal class Resources { } /// - /// Looks up a localized string similar to Current year (2 digits). + /// Looks up a localized string similar to Year (2 digits). /// internal static string ReplCodeMenuEntry_yy_Current_year__2_digits_ { get { diff --git a/ShareX.HelpersLib/Properties/Resources.resx b/ShareX.HelpersLib/Properties/Resources.resx index c534f49a2..26f752f33 100644 --- a/ShareX.HelpersLib/Properties/Resources.resx +++ b/ShareX.HelpersLib/Properties/Resources.resx @@ -121,7 +121,7 @@ Freehand region - Current week name (Local language) + Week name (Local language) Settings copied to your clipboard. @@ -130,7 +130,7 @@ Tools - Current second + Second Custom text uploader @@ -142,7 +142,7 @@ None - Current month + Month Browse for a Cascading Style Sheet... @@ -247,7 +247,7 @@ File uploader - Current hour + Hour Other @@ -259,7 +259,7 @@ Update check failed - Current millisecond + Millisecond Redirection URL @@ -277,13 +277,13 @@ Upload folder - Current minute + Minute Pixelate (P) - Current day + Day 1 Day @@ -447,7 +447,7 @@ Would you like to download it? Yes - Current month name (Local language) + Month name (Local language) ..\Resources\ShareX_Icon_White.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -501,7 +501,7 @@ Would you like to download it? Tools - Current year (2 digits) + Year (2 digits) Auto increment number. 0 pad left using {n} @@ -552,7 +552,7 @@ Would you like to download it? Screen record - Gets AM/PM + AM/PM Browse for a folder... @@ -582,7 +582,7 @@ Would you like to download it? Abort screen recording - Current year + Year 2 Weeks @@ -909,7 +909,7 @@ Would you like to download and install it? Process name of window - Current month name (English) + Month name (English) Open screenshots folder @@ -921,7 +921,7 @@ Would you like to download and install it? Show tray balloon tip - Current week name (English) + Week name (English) Cyan: {0:0.0}%, Magenta: {1:0.0}%, Yellow: {2:0.0}%, Key: {3:0.0}% @@ -1202,4 +1202,7 @@ Would you like to download and install it? Random emoji. Repeat using {n} + + Week of year + \ No newline at end of file