1
Properly handle translated strings in nose tests
2
--- a/tests/TestProfileSettings.py
3
+++ b/tests/TestProfileSettings.py
6
# The 1st default profile
8
- assert _("Send %s images to 1fichier.com") % _("small") == p.name
9
+ assert p.name == _("Send %(imageSize)s images to %(uploadUrl)s") % {"imageSize": _("small"), "uploadUrl": "1fichier.com"}
10
assert "small" == p.size
11
assert 90 == p.quality
12
assert "upload" == p.destination
14
# There are 5 default profiles
15
assert 5 == len(conf.profiles)
19
# Create a new profile that is a copy of the first default profile.
20
# It should be detected as being the same as the first profile.
21
newProfile = copy(conf.profiles[0])
24
newProfile = Profile(name=_("Send %(imageSize)s images to %(uploadUrl)s") % {
25
"imageSize": _("small"),
26
- "uploadUrl": "1fichier.com"},
32
zipname="%s.zip" % _("resized"),
35
assert 0 == conf.addprofile(newProfile)
37
# Create a new profile that is a copy of the first default profile
39
# new profile will be changed to contain the quality
40
newProfile = copy(conf.profiles[0])
41
newProfile.quality = 80
42
- assert _("Send small images to 1fichier.com") == conf.profiles[0].name
43
+ assert conf.profiles[0].name == _("Send %(imageSize)s images to %(uploadUrl)s") % {"imageSize": _("small"), "uploadUrl": up}
44
assert 4 == conf.addprofile(newProfile)
45
- pname = _("Send %s images to 1fichier.com") + " " + _("(%d%% quality)")
46
- assert pname % (_("small"), 90) == conf.profiles[0].name
47
- assert pname % (_("small"), 80) == conf.profiles[4].name
48
+ pname = _("Send %(imageSize)s images to %(uploadUrl)s") + " " + _("(%d%% quality)")
49
+ pname = pname.replace("%d%%", "%(quality)d%%")
50
+ assert conf.profiles[0].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 90}
51
+ assert conf.profiles[4].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 80}
53
# Create a new profile that is a copy of the first default profile
54
# but has yet another quality. The name of the first, fifth and the
55
# new profile will be changed to contain the quality
56
newProfile = copy(conf.profiles[0])
57
newProfile.quality = 70
58
- assert pname % (_("small"), 90) == conf.profiles[0].name
59
- assert pname % (_("small"), 80) == conf.profiles[4].name
60
+ assert conf.profiles[0].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 90}
61
+ assert conf.profiles[4].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 80}
62
assert 5 == conf.addprofile(newProfile)
63
- assert pname % (_("small"), 90) == conf.profiles[0].name
64
- assert pname % (_("small"), 80) == conf.profiles[4].name
65
- assert pname % (_("small"), 70) == conf.profiles[5].name
66
+ assert conf.profiles[0].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 90}
67
+ assert conf.profiles[4].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 80}
68
+ assert conf.profiles[5].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 70}
70
# Create a new profile that is a copy of the first default profile
71
# that has the same quality but a very large size. The name of the
73
newProfile.width = 2000
74
newProfile.height = 2000
75
newProfile.createname(setSelf=True)
76
- assert pname % (_("small"), 90) == conf.profiles[0].name
77
- assert pname % (_("small"), 80) == conf.profiles[4].name
78
- assert pname % (_("small"), 70) == conf.profiles[5].name
79
+ assert conf.profiles[0].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 90}
80
+ assert conf.profiles[4].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 80}
81
+ assert conf.profiles[5].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 70}
82
assert 6 == conf.addprofile(newProfile)
83
- assert pname % (_("small"), 90) == conf.profiles[0].name
84
- assert pname % (_("small"), 80) == conf.profiles[4].name
85
- assert pname % (_("small"), 70) == conf.profiles[5].name
86
+ assert conf.profiles[0].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 90}
87
+ assert conf.profiles[4].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 80}
88
+ assert conf.profiles[5].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 70}
89
assert conf.profiles[6].createname() == conf.profiles[6].name
91
# Create a new profile that is a copy of the first default profile
93
newProfile.width = 639
94
newProfile.height = 640
95
newProfile.createname(setSelf=True)
96
- assert pname % (_("small"), 90) == conf.profiles[0].name
97
- assert pname % (_("small"), 80) == conf.profiles[4].name
98
- assert pname % (_("small"), 70) == conf.profiles[5].name
99
+ assert conf.profiles[0].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 90}
100
+ assert conf.profiles[4].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 80}
101
+ assert conf.profiles[5].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 70}
102
assert conf.profiles[6].createname() == conf.profiles[6].name
103
assert 7 == conf.addprofile(newProfile)
104
- assert pname % (_("small") + " (640x640)", 90) == conf.profiles[0].name
105
- assert pname % (_("small"), 80) == conf.profiles[4].name
106
- assert pname % (_("small"), 70) == conf.profiles[5].name
107
+ assert conf.profiles[0].name == pname % {"imageSize": _("small") + " (640x640)", "uploadUrl": up, "quality": 90}
108
+ assert conf.profiles[4].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 80}
109
+ assert conf.profiles[5].name == pname % {"imageSize": _("small"), "uploadUrl": up, "quality": 70}
110
assert conf.profiles[6].createname() == conf.profiles[6].name
111
- assert pname % (_("small") + " (639x640)", 90) == conf.profiles[7].name
112
+ assert conf.profiles[7].name == pname % {"imageSize": _("small") + " (639x640)", "uploadUrl": up, "quality": 90}
114
def test_deleteprofile(self):
115
# Make sure there is no saved profile in /tmp/nim-test.config
118
# There are 6 profiles in the saved config file
119
assert 6 == len(conf.profiles)
120
- assert _("Send %s images to 1fichier.com") % _("small") == conf.profiles[0].name
121
+ assert conf.profiles[0].name == _("Send %(imageSize)s images to %(uploadUrl)s") % {"imageSize": _("small"), "uploadUrl": "1fichier.com"}
122
assert _("Create %(imageSize)s images and append \"%(appendString)s\"") % {
123
"imageSize": _("%d%% resized") % 50,
124
"appendString": _("resized")} == conf.profiles[4].name