Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/plugin/PluginClass.cpp

Issue 29333426: Issue 3501 - use hardcoded value until there is a real error message
Patch Set: Created Jan. 12, 2016, 7:26 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is part of Adblock Plus <https://adblockplus.org/>, 2 * This file is part of Adblock Plus <https://adblockplus.org/>,
3 * Copyright (C) 2006-2015 Eyeo GmbH 3 * Copyright (C) 2006-2015 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 1606 matching lines...) Expand 10 before | Expand all | Expand 10 after
1617 std::wstring upToDateText = dictionary->Lookup("updater", "update-alread y-up-to-date-text"); 1617 std::wstring upToDateText = dictionary->Lookup("updater", "update-alread y-up-to-date-text");
1618 std::wstring upToDateTitle = dictionary->Lookup("updater", "update-alrea dy-up-to-date-title"); 1618 std::wstring upToDateTitle = dictionary->Lookup("updater", "update-alrea dy-up-to-date-title");
1619 pClass->notificationMessage.SetTextAndIcon(upToDateText, upToDateTitle, TTI_INFO); 1619 pClass->notificationMessage.SetTextAndIcon(upToDateText, upToDateTitle, TTI_INFO);
1620 break; 1620 break;
1621 } 1621 }
1622 case WM_UPDATE_CHECK_ERROR: 1622 case WM_UPDATE_CHECK_ERROR:
1623 { 1623 {
1624 Dictionary* dictionary = Dictionary::GetInstance(); 1624 Dictionary* dictionary = Dictionary::GetInstance();
1625 std::wstring errorText = dictionary->Lookup("updater", "update-error-tex t"); 1625 std::wstring errorText = dictionary->Lookup("updater", "update-error-tex t");
1626 std::wstring errorTitle = dictionary->Lookup("updater", "update-error-ti tle"); 1626 std::wstring errorTitle = dictionary->Lookup("updater", "update-error-ti tle");
1627 // use hardcoded value until there is a real error message
1628 ReplaceString(errorText , L"?1?", L"Unknown error");
Eric 2016/01/13 15:14:13 I'm uncomfortable with putting an English phrase i
1627 pClass->notificationMessage.SetTextAndIcon(errorText, errorTitle, TTI_ER ROR); 1629 pClass->notificationMessage.SetTextAndIcon(errorText, errorTitle, TTI_ER ROR);
1628 break; 1630 break;
1629 } 1631 }
1630 case WM_DOWNLOADING_UPDATE: 1632 case WM_DOWNLOADING_UPDATE:
1631 { 1633 {
1632 Dictionary* dictionary = Dictionary::GetInstance(); 1634 Dictionary* dictionary = Dictionary::GetInstance();
1633 std::wstring downloadingText = dictionary->Lookup("updater", "downloadin g-update-text"); 1635 std::wstring downloadingText = dictionary->Lookup("updater", "downloadin g-update-text");
1634 std::wstring downloadingTitle = dictionary->Lookup("updater", "downloadi ng-update-title"); 1636 std::wstring downloadingTitle = dictionary->Lookup("updater", "downloadi ng-update-title");
1635 pClass->notificationMessage.SetTextAndIcon(downloadingText, downloadingT itle, TTI_INFO); 1637 pClass->notificationMessage.SetTextAndIcon(downloadingText, downloadingT itle, TTI_INFO);
1636 break; 1638 break;
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
1704 s_criticalSectionLocal.Unlock(); 1706 s_criticalSectionLocal.Unlock();
1705 1707
1706 return icon; 1708 return icon;
1707 } 1709 }
1708 1710
1709 ATOM CPluginClass::GetAtomPaneClass() 1711 ATOM CPluginClass::GetAtomPaneClass()
1710 { 1712 {
1711 return s_atomPaneClass; 1713 return s_atomPaneClass;
1712 } 1714 }
1713 1715
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld