PATCH: [ 1896462 ] Load EOL type strings from resource and unify them

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 8344fd7..74f41c7 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -8,6 +8,7 @@ WinMerge 2.7.7.5
   Move Time difference ignore -option to compare options (#1892283)
   Add option to select temporary folder (#1893167)
   Show file encoding in file compare statusbar (#1895629)
+  Unify EOL style strings in folder compare and file compare (#1896462)
   BugFix: Potential lockup in folder compare (#1865131, #1889907)
   BugFix: Line filter didn't filter non-ascii lines correctly (#1880628)
   BugFix: GNU General Public License name in menu (#1868989)

diff --git a/Src/ChildFrm.cpp b/Src/ChildFrm.cpp
index 3ec8bbb..a568d87 100644 (file)
--- a/Src/ChildFrm.cpp
+++ b/Src/ChildFrm.cpp
@@ -51,6 +51,8 @@ static UINT ENCODING_PANEL_WIDTH = 80;
 /** @brief EOL type status panel width */
 static UINT EOL_PANEL_WIDTH = 40;
 
+static CString EolString(const CString & sEol);
+
 /////////////////////////////////////////////////////////////////////////////
 // CChildFrame
 
@@ -717,11 +719,28 @@ void CChildFrame::MergeStatus::UpdateResources()
 /// Visible representation of eol
 static CString EolString(const CString & sEol)
 {
-       if (sEol == _T("hidden")) return _T("");
-       if (sEol == _T("\r\n")) return _T("CRLF");
-       if (sEol == _T("\n")) return _T("LF");
-       if (sEol == _T("\r")) return _T("CR");
-       if (sEol.IsEmpty()) return _T("None");
+       if (sEol == _T("\r\n"))
+       {
+               String eol = LoadResString(IDS_EOL_CRLF);
+               return eol.c_str();
+       }
+       if (sEol == _T("\n"))
+       {
+               String eol = LoadResString(IDS_EOL_LF);
+               return eol.c_str();
+       }
+       if (sEol == _T("\r"))
+       {
+               String eol = LoadResString(IDS_EOL_CR);
+               return eol.c_str();
+       }
+       if (sEol.IsEmpty())
+       {
+               String eol = LoadResString(IDS_EOL_NONE);
+               return eol.c_str();
+       }
+       if (sEol == _T("hidden"))
+               return _T("");
        return _T("?");
 }
 

diff --git a/Src/Languages/English.pot b/Src/Languages/English.pot
index 370f365..2a1cfa5 100644 (file)
--- a/Src/Languages/English.pot
+++ b/Src/Languages/English.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=13216&atid=113216\n"
-"POT-Creation-Date: 2008-02-16 18:59+0000\n"
+"POT-Creation-Date: 2008-02-19 17:42+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -692,7 +692,7 @@ msgid "&Scripts"
 msgstr ""
 
 #: Merge.rc:360
-#: Merge.rc:2702
+#: Merge.rc:2706
 #, c-format
 msgid "< Empty >"
 msgstr ""
@@ -3526,7 +3526,8 @@ msgid "Versioning System returned an error while attempting to undo checkout the
 msgstr ""
 
 #: Merge.rc:2130
-#: Merge.rc:2738
+#: Merge.rc:2565
+#: Merge.rc:2742
 #, c-format
 msgid "None"
 msgstr ""
@@ -4784,667 +4785,682 @@ msgstr ""
 msgid "Mixed"
 msgstr ""
 
-#: Merge.rc:2567
+#: Merge.rc:2562
+#, c-format
+msgid "LF"
+msgstr ""
+
+#: Merge.rc:2563
+#, c-format
+msgid "CR"
+msgstr ""
+
+#: Merge.rc:2564
+#, c-format
+msgid "CRLF"
+msgstr ""
+
+#: Merge.rc:2571
 #, c-format
 msgid " B"
 msgstr ""
 
-#: Merge.rc:2568
+#: Merge.rc:2572
 #, c-format
 msgid " KB"
 msgstr ""
 
-#: Merge.rc:2569
+#: Merge.rc:2573
 #, c-format
 msgid " MB"
 msgstr ""
 
-#: Merge.rc:2570
+#: Merge.rc:2574
 #, c-format
 msgid " GB"
 msgstr ""
 
-#: Merge.rc:2571
+#: Merge.rc:2575
 #, c-format
 msgid " TB"
 msgstr ""
 
-#: Merge.rc:2572
+#: Merge.rc:2576
 #, c-format
 msgid " PB"
 msgstr ""
 
-#: Merge.rc:2579
+#: Merge.rc:2583
 #, c-format
 msgid "Save the left file"
 msgstr ""
 
-#: Merge.rc:2580
+#: Merge.rc:2584
 #, c-format
 msgid "Save the right file"
 msgstr ""
 
-#: Merge.rc:2581
+#: Merge.rc:2585
 #, c-format
 msgid "Save the left file with name..."
 msgstr ""
 
-#: Merge.rc:2582
+#: Merge.rc:2586
 #, c-format
 msgid "Save the right file with name..."
 msgstr ""
 
-#: Merge.rc:2583
+#: Merge.rc:2587
 #, c-format
 msgid "Change left file/dir read-only status"
 msgstr ""
 
-#: Merge.rc:2584
+#: Merge.rc:2588
 #, c-format
 msgid "Change right file/dir read-only status"
 msgstr ""
 
-#: Merge.rc:2585
+#: Merge.rc:2589
 #, c-format
 msgid "Convert EOL to DOS mode"
 msgstr ""
 
-#: Merge.rc:2586
+#: Merge.rc:2590
 #, c-format
 msgid "Convert EOL to UNIX mode"
 msgstr ""
 
-#: Merge.rc:2587
+#: Merge.rc:2591
 #, c-format
 msgid "Convert EOL to MAC mode"
 msgstr ""
 
-#: Merge.rc:2588
+#: Merge.rc:2592
 #, c-format
 msgid "Switch between editing and merging modes"
 msgstr ""
 
-#: Merge.rc:2589
+#: Merge.rc:2593
 #, c-format
 msgid "View and adjust file encoding properties\nFile encoding properties"
 msgstr ""
 
-#: Merge.rc:2590
+#: Merge.rc:2594
 #, c-format
 msgid "Open and resolve conflict file"
 msgstr ""
 
-#: Merge.rc:2596
+#: Merge.rc:2600
 #, c-format
 msgid "Select difference area in the current line\nDifference in the Current Line"
 msgstr ""
 
-#: Merge.rc:2597
+#: Merge.rc:2601
 #, c-format
 msgid "Go to line or difference\nGo to (Ctrl+G)"
 msgstr ""
 
-#: Merge.rc:2598
+#: Merge.rc:2602
 #, c-format
 msgid "Set program options\nOptions"
 msgstr ""
 
-#: Merge.rc:2599
+#: Merge.rc:2603
 #, c-format
 msgid "Refresh display\nRefresh (F5)"
 msgstr ""
 
-#: Merge.rc:2600
+#: Merge.rc:2604
 #, c-format
 msgid "Copy selected lines to clipboard adding linenumbers to line begin"
 msgstr ""
 
-#: Merge.rc:2601
+#: Merge.rc:2605
 #, c-format
 msgid "Refresh selected items"
 msgstr ""
 
-#: Merge.rc:2602
+#: Merge.rc:2606
 #, c-format
 msgid "Toggle bookmark"
 msgstr ""
 
-#: Merge.rc:2603
+#: Merge.rc:2607
 #, c-format
 msgid "Go to next bookmark"
 msgstr ""
 
-#: Merge.rc:2604
+#: Merge.rc:2608
 #, c-format
 msgid "Go to previous bookmark"
 msgstr ""
 
-#: Merge.rc:2605
+#: Merge.rc:2609
 #, c-format
 msgid "Clear all bookmarks"
 msgstr ""
 
-#: Merge.rc:2611
+#: Merge.rc:2615
 #, c-format
 msgid "Displays items that are exactly the same\nShow Identical Items"
 msgstr ""
 
-#: Merge.rc:2612
+#: Merge.rc:2616
 #, c-format
 msgid "Displays items that have differences\nShow Different Items"
 msgstr ""
 
-#: Merge.rc:2613
+#: Merge.rc:2617
 #, c-format
 msgid "Displays items that exist in only on the left side\nShow Left Unique Items"
 msgstr ""
 
-#: Merge.rc:2614
+#: Merge.rc:2618
 #, c-format
 msgid "Displays items that exist in only on the right side\nShow Right Unique Items"
 msgstr ""
 
-#: Merge.rc:2615
+#: Merge.rc:2619
 #, c-format
 msgid "Displays binary files\nShow Binary Files"
 msgstr ""
 
-#: Merge.rc:2616
+#: Merge.rc:2620
 #, c-format
 msgid "Displays skipped items\nShow Skipped Items"
 msgstr ""
 
-#: Merge.rc:2622
+#: Merge.rc:2626
 #, c-format
 msgid "Select the font for the view\nSelect View Font"
 msgstr ""
 
-#: Merge.rc:2623
+#: Merge.rc:2627
 #, c-format
 msgid "Revert to using the default system font for view\nDefault Font"
 msgstr ""
 
-#: Merge.rc:2624
+#: Merge.rc:2628
 #, c-format
 msgid "Shows whitespace characters"
 msgstr ""
 
-#: Merge.rc:2625
+#: Merge.rc:2629
 #, c-format
 msgid "Toggle Diff Pane"
 msgstr ""
 
-#: Merge.rc:2626
+#: Merge.rc:2630
 #, c-format
 msgid "Location pane shows overall picture from files"
 msgstr ""
 
-#: Merge.rc:2627
+#: Merge.rc:2631
 #, c-format
 msgid "Show folder compare statistics dialog"
 msgstr ""
 
-#: Merge.rc:2628
+#: Merge.rc:2632
 #, c-format
 msgid "Select the current user interfacce language\nLanguage"
 msgstr ""
 
-#: Merge.rc:2629
+#: Merge.rc:2633
 #, c-format
 msgid "Shows differences inside lines with different color\nShow Line Diff"
 msgstr ""
 
-#: Merge.rc:2630
+#: Merge.rc:2634
 #, c-format
 msgid "Swap the positions of the two panes"
 msgstr ""
 
-#: Merge.rc:2631
+#: Merge.rc:2635
 #, c-format
 msgid "Shows line numbers\nShow Line Numbers"
 msgstr ""
 
-#: Merge.rc:2632
+#: Merge.rc:2636
 #, c-format
 msgid "Enable word wrap\nWrap Lines"
 msgstr ""
 
-#: Merge.rc:2633
+#: Merge.rc:2637
 #, c-format
 msgid "Shows selection margins for both panes\nShow Selection Margins"
 msgstr ""
 
-#: Merge.rc:2634
+#: Merge.rc:2638
 #, c-format
 msgid "Increase text size"
 msgstr ""
 
-#: Merge.rc:2635
+#: Merge.rc:2639
 #, c-format
 msgid "Decrease text size"
 msgstr ""
 
-#: Merge.rc:2636
+#: Merge.rc:2640
 #, c-format
 msgid "Reset text zoom to default size"
 msgstr ""
 
-#: Merge.rc:2642
+#: Merge.rc:2646
 #, c-format
 msgid "Scroll to the previous difference\nPrev Diff (Alt+Up)"
 msgstr ""
 
-#: Merge.rc:2643
+#: Merge.rc:2647
 #, c-format
 msgid "Scroll to the next difference\nNext Diff (Alt+Down)"
 msgstr ""
 
-#: Merge.rc:2644
+#: Merge.rc:2648
 #, c-format
 msgid "Scroll to the first difference\nFirst Diff (Alt+Home)"
 msgstr ""
 
-#: Merge.rc:2645
+#: Merge.rc:2649
 #, c-format
 msgid "Scroll to the current difference\nCurrent Diff (Alt+Enter)"
 msgstr ""
 
-#: Merge.rc:2646
+#: Merge.rc:2650
 #, c-format
 msgid "Scroll to the last difference\nLast Diff (Alt+End)"
 msgstr ""
 
-#: Merge.rc:2647
+#: Merge.rc:2651
 #, c-format
 msgid "Copy the selected text to the right file\nCopy Right (Alt+Right)"
 msgstr ""
 
-#: Merge.rc:2648
+#: Merge.rc:2652
 #, c-format
 msgid "Copy the selected text to the left file\nCopy Left (Alt+Left)"
 msgstr ""
 
-#: Merge.rc:2649
+#: Merge.rc:2653
 #, c-format
 msgid "Copy difference to right and advance to next\nCopy Right and Advance (Ctrl+Alt+Right)"
 msgstr ""
 
-#: Merge.rc:2650
+#: Merge.rc:2654
 #, c-format
 msgid "Copy difference to left and advance to next\nCopy Left and Advance (Ctrl+Alt+Left)"
 msgstr ""
 
-#: Merge.rc:2651
+#: Merge.rc:2655
 #, c-format
 msgid "Copy all differences to the right file\nAll Right"
 msgstr ""
 
-#: Merge.rc:2652
+#: Merge.rc:2656
 #, c-format
 msgid "Copy all differences to the left file\nAll Left"
 msgstr ""
 
-#: Merge.rc:2653
+#: Merge.rc:2657
 #, c-format
 msgid "Delete selected items from both directories"
 msgstr ""
 
-#: Merge.rc:2654
+#: Merge.rc:2658
 #, c-format
 msgid "Compare selected item (compare first item if multiple items selected)"
 msgstr ""
 
-#: Merge.rc:2660
+#: Merge.rc:2664
 #, c-format
 msgid "Select and reorder directory compare columns"
 msgstr ""
 
-#: Merge.rc:2661
+#: Merge.rc:2665
 #, c-format
 msgid "Generate a patch-file"
 msgstr ""
 
-#: Merge.rc:2662
+#: Merge.rc:2666
 #, c-format
 msgid "Select and modify filters"
 msgstr ""
 
-#: Merge.rc:2663
+#: Merge.rc:2667
 #, c-format
 msgid "Generates a report from compare results"
 msgstr ""
 
-#: Merge.rc:2669
+#: Merge.rc:2673
 #, c-format
 msgid "The user selects the unpacker (no unpacking when comparing dir)"
 msgstr ""
 
-#: Merge.rc:2670
+#: Merge.rc:2674
 #, c-format
 msgid "The adapted unpacker is applied to both files (one file only needs the extension)"
 msgstr ""
 
-#: Merge.rc:2671
+#: Merge.rc:2675
 #, c-format
 msgid "Select an unpacker to edit this file"
 msgstr ""
 
-#: Merge.rc:2672
+#: Merge.rc:2676
 #, c-format
 msgid "No prediffer (normal)"
 msgstr ""
 
-#: Merge.rc:2673
+#: Merge.rc:2677
 #, c-format
 msgid "Suggested plugins"
 msgstr ""
 
-#: Merge.rc:2674
+#: Merge.rc:2678
 #, c-format
 msgid "Other plugins"
 msgstr ""
 
-#: Merge.rc:2675
+#: Merge.rc:2679
 #, c-format
 msgid "Unload all plugins and reload them (for developers)"
 msgstr ""
 
-#: Merge.rc:2681
+#: Merge.rc:2685
 #, c-format
 msgid "Activates next file visible\nActive next File"
 msgstr ""
 
-#: Merge.rc:2682
+#: Merge.rc:2686
 #, c-format
 msgid "Closes all open windows"
 msgstr ""
 
-#: Merge.rc:2688
+#: Merge.rc:2692
 #, c-format
 msgid "Opens the WinMerge Help\nWinMerge Help"
 msgstr ""
 
-#: Merge.rc:2689
+#: Merge.rc:2693
 #, c-format
 msgid "Outputs current WinMerge version info and configuration to text file"
 msgstr ""
 
-#: Merge.rc:2690
+#: Merge.rc:2694
 #, c-format
 msgid "Display the GNU General Public License"
 msgstr ""
 
-#: Merge.rc:2691
+#: Merge.rc:2695
 #, c-format
 msgid "Private Build: %1"
 msgstr ""
 
-#: Merge.rc:2692
+#: Merge.rc:2696
 #, c-format
 msgid "Opens the release notes document\nRelease Notes"
 msgstr ""
 
-#: Merge.rc:2693
+#: Merge.rc:2697
 #, c-format
 msgid "Opens the translations website\nTranslations"
 msgstr ""
 
-#: Merge.rc:2699
+#: Merge.rc:2703
 #, c-format
 msgid "Plugin Settings"
 msgstr ""
 
-#: Merge.rc:2700
+#: Merge.rc:2704
 #, c-format
 msgid "No prediffer"
 msgstr ""
 
-#: Merge.rc:2701
+#: Merge.rc:2705
 #, c-format
 msgid "Prediff if possible"
 msgstr ""
 
-#: Merge.rc:2703
+#: Merge.rc:2707
 #, c-format
 msgid "WSH not found - .sct scripts disabled"
 msgstr ""
 
-#: Merge.rc:2704
+#: Merge.rc:2708
 #, c-format
 msgid "<None>"
 msgstr ""
 
-#: Merge.rc:2705
+#: Merge.rc:2709
 #, c-format
 msgid "<Automatic>"
 msgstr ""
 
-#: Merge.rc:2711
+#: Merge.rc:2715
 #, c-format
 msgid "Open the file with registered application"
 msgstr ""
 
-#: Merge.rc:2712
+#: Merge.rc:2716
 #, c-format
 msgid "Open the file with external editor"
 msgstr ""
 
-#: Merge.rc:2713
+#: Merge.rc:2717
 #, c-format
 msgid "Open the file with a particular program"
 msgstr ""
 
-#: Merge.rc:2719
+#: Merge.rc:2723
 #, c-format
 msgid "Do not display moved blocks"
 msgstr ""
 
-#: Merge.rc:2720
+#: Merge.rc:2724
 #, c-format
 msgid "Display all moved blocks"
 msgstr ""
 
-#: Merge.rc:2721
+#: Merge.rc:2725
 #, c-format
 msgid "Display moved blocks only from current diff"
 msgstr ""
 
-#: Merge.rc:2722
+#: Merge.rc:2726
 #, c-format
 msgid "Go to diff under cursor"
 msgstr ""
 
-#: Merge.rc:2723
+#: Merge.rc:2727
 #, c-format
 msgid "G&oto Diff %1 of %2"
 msgstr ""
 
-#: Merge.rc:2724
+#: Merge.rc:2728
 #, c-format
 msgid "G&oto Line %1"
 msgstr ""
 
-#: Merge.rc:2730
+#: Merge.rc:2734
 #, c-format
 msgid "Disabled"
 msgstr ""
 
-#: Merge.rc:2731
+#: Merge.rc:2735
 #, c-format
 msgid "From file system"
 msgstr ""
 
-#: Merge.rc:2732
+#: Merge.rc:2736
 #, c-format
 msgid "From MRU list"
 msgstr ""
 
-#: Merge.rc:2739
+#: Merge.rc:2743
 #, c-format
 msgid "ASP"
 msgstr ""
 
-#: Merge.rc:2740
+#: Merge.rc:2744
 #, c-format
 msgid "Basic"
 msgstr ""
 
-#: Merge.rc:2741
+#: Merge.rc:2745
 #, c-format
 msgid "Batch"
 msgstr ""
 
-#: Merge.rc:2742
+#: Merge.rc:2746
 #, c-format
 msgid "C/C++"
 msgstr ""
 
-#: Merge.rc:2743
+#: Merge.rc:2747
 #, c-format
 msgid "C#"
 msgstr ""
 
-#: Merge.rc:2744
+#: Merge.rc:2748
 #, c-format
 msgid "CSS"
 msgstr ""
 
-#: Merge.rc:2745
+#: Merge.rc:2749
 #, c-format
 msgid "DCL"
 msgstr ""
 
-#: Merge.rc:2746
+#: Merge.rc:2750
 #, c-format
 msgid "Fortran"
 msgstr ""
 
-#: Merge.rc:2747
+#: Merge.rc:2751
 #, c-format
 msgid "HTML"
 msgstr ""
 
-#: Merge.rc:2748
+#: Merge.rc:2752
 #, c-format
 msgid "INI"
 msgstr ""
 
-#: Merge.rc:2749
+#: Merge.rc:2753
 #, c-format
 msgid "InnoSetup"
 msgstr ""
 
-#: Merge.rc:2750
+#: Merge.rc:2754
 #, c-format
 msgid "InstallShield"
 msgstr ""
 
-#: Merge.rc:2751
+#: Merge.rc:2755
 #, c-format
 msgid "Java"
 msgstr ""
 
-#: Merge.rc:2752
+#: Merge.rc:2756
 #, c-format
 msgid "AutoLISP"
 msgstr ""
 
-#: Merge.rc:2753
+#: Merge.rc:2757
 #, c-format
 msgid "NSIS"
 msgstr ""
 
-#: Merge.rc:2754
+#: Merge.rc:2758
 #, c-format
 msgid "Pascal"
 msgstr ""
 
-#: Merge.rc:2755
+#: Merge.rc:2759
 #, c-format
 msgid "Perl"
 msgstr ""
 
-#: Merge.rc:2756
+#: Merge.rc:2760
 #, c-format
 msgid "PHP"
 msgstr ""
 
-#: Merge.rc:2757
+#: Merge.rc:2761
 #, c-format
 msgid "Portable Object"
 msgstr ""
 
-#: Merge.rc:2758
+#: Merge.rc:2762
 #, c-format
 msgid "PowerShell"
 msgstr ""
 
-#: Merge.rc:2759
+#: Merge.rc:2763
 #, c-format
 msgid "Python"
 msgstr ""
 
-#: Merge.rc:2760
+#: Merge.rc:2764
 #, c-format
 msgid "REXX"
 msgstr ""
 
-#: Merge.rc:2761
+#: Merge.rc:2765
 #, c-format
 msgid "Resources"
 msgstr ""
 
-#: Merge.rc:2762
+#: Merge.rc:2766
 #, c-format
 msgid "Ruby"
 msgstr ""
 
-#: Merge.rc:2763
+#: Merge.rc:2767
 #, c-format
 msgid "SGML"
 msgstr ""
 
-#: Merge.rc:2764
+#: Merge.rc:2768
 #, c-format
 msgid "Shell"
 msgstr ""
 
-#: Merge.rc:2765
+#: Merge.rc:2769
 #, c-format
 msgid "SIOD"
 msgstr ""
 
-#: Merge.rc:2766
+#: Merge.rc:2770
 #, c-format
 msgid "SQL"
 msgstr ""
 
-#: Merge.rc:2767
+#: Merge.rc:2771
 #, c-format
 msgid "TCL"
 msgstr ""
 
-#: Merge.rc:2768
+#: Merge.rc:2772
 #, c-format
 msgid "TEX"
 msgstr ""
 
-#: Merge.rc:2769
+#: Merge.rc:2773
 #, c-format
 msgid "XML"
 msgstr ""
 
-#: Merge.rc:2774
+#: Merge.rc:2778
 #, c-format
 msgid "Hide the toolbar"
 msgstr ""
 
-#: Merge.rc:2775
+#: Merge.rc:2779
 #, c-format
 msgid "Show small toolbar"
 msgstr ""
 
-#: Merge.rc:2776
+#: Merge.rc:2780
 #, c-format
 msgid "Show big toolbar"
 msgstr ""

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 84af0bb..fe3938d 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -2551,7 +2551,7 @@ BEGIN
        IDS_CP_WINDOWS_HEBREW_EXTRA     "Approximates ISO-8859-8"
 END
 
-// EOL types shown in folder compare EOL type column
+// EOL types shown in folder compare EOL type column and in file compare statusbar
 STRINGTABLE
 BEGIN
     IDS_EOL_DOS             "Win"
@@ -2559,6 +2559,10 @@ BEGIN
     IDS_EOL_UNIX            "Unix"
     IDS_EOL_MIXED           "Mixed"
     IDS_EOL_BIN             "Binary"
+    IDS_EOL_LF              "LF"
+    IDS_EOL_CR              "CR"
+    IDS_EOL_CRLF            "CRLF"
+    IDS_EOL_NONE            "None"
 END
 
 // Folder compare short size suffixes

diff --git a/Src/editlib/ccrystaltextview.cpp b/Src/editlib/ccrystaltextview.cpp
index ec634d5..b09a36c 100644 (file)
--- a/Src/editlib/ccrystaltextview.cpp
+++ b/Src/editlib/ccrystaltextview.cpp
@@ -91,6 +91,7 @@
 #include <malloc.h>
 #include <imm.h> /* IME */
 #include <mbctype.h>
+#include "UnicodeString.h"
 #include "editcmd.h"
 #include "editreg.h"
 #include "ccrystaltextview.h"
@@ -4511,19 +4512,23 @@ OnUpdateIndicatorCRLF (CCmdUI * pCmdUI)
 {
   if (m_pTextBuffer != NULL)
     {
+      String eol;
       int crlfMode = m_pTextBuffer->GetCRLFMode ();
       switch (crlfMode)
         {
         case CRLF_STYLE_DOS:
-          pCmdUI->SetText (_T ("DOS"));
+          eol = LoadResString (IDS_EOL_DOS);
+          pCmdUI->SetText (eol.c_str());
           pCmdUI->Enable (TRUE);
           break;
         case CRLF_STYLE_UNIX:
-          pCmdUI->SetText (_T ("UNIX"));
+          eol = LoadResString (IDS_EOL_UNIX);
+          pCmdUI->SetText (eol.c_str());
           pCmdUI->Enable (TRUE);
           break;
         case CRLF_STYLE_MAC:
-          pCmdUI->SetText (_T ("MAC"));
+          eol = LoadResString (IDS_EOL_MAC);
+          pCmdUI->SetText (eol.c_str());
           pCmdUI->Enable (TRUE);
           break;
         default:

diff --git a/Src/resource.h b/Src/resource.h
index 1778394..ae8938b 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -850,6 +850,10 @@
 #define IDS_EOL_UNIX                    30402
 #define IDS_EOL_MIXED                   30403
 #define IDS_EOL_BIN                     30404
+#define IDS_EOL_LF                      30405
+#define IDS_EOL_CR                      30406
+#define IDS_EOL_CRLF                    30407
+#define IDS_EOL_NONE                    30408
 #define IDS_SUFFIX_BYTE                 30416
 #define IDS_SUFFIX_KILO                 30417
 #define IDS_SUFFIX_MEGA                 30418