Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristhofer Travieso <cristhofert97@gmail.com>2012-10-17 11:09:52 (GMT)
committer Cristhofer Travieso <cristhofert97@gmail.com>2012-10-17 11:09:52 (GMT)
commitf61939b8d00f0dfa28a0f09e880093f6b92974a9 (patch)
treeafdea6bfe9232428a202c9026647da5a6937dd05
parentcdbd022c7c40d35dc1a80edf70957d4fc6d832f0 (diff)
Fix orthographic error
Signed-off-by: Cristhofer Travieso <cristhofert97@gmail.com>
-rw-r--r--activity.py26
-rw-r--r--convert.py26
-rw-r--r--icons/length.svg (renamed from icons/lenght.svg)0
-rw-r--r--icons/liquid.svg73
4 files changed, 26 insertions, 99 deletions
diff --git a/activity.py b/activity.py
index 8ba898c..685bd79 100644
--- a/activity.py
+++ b/activity.py
@@ -102,55 +102,55 @@ class ConvertActivity(activity.Activity):
toolbarbox.toolbar.insert(separator, -1)
# RadioToolButton
- self._lenght_btn = RadioToolButton()
- self._lenght_btn.connect('clicked',
- lambda w: self._update_combo(convert.lenght))
- self._lenght_btn.set_tooltip(_('Lenght'))
- self._lenght_btn.props.icon_name = 'lenght'
+ self._length_btn = RadioToolButton()
+ self._length_btn.connect('clicked',
+ lambda w: self._update_combo(convert.length))
+ self._length_btn.set_tooltip(_('Length'))
+ self._length_btn.props.icon_name = 'length'
self._volume_btn = RadioToolButton()
self._volume_btn.connect('clicked',
lambda w: self._update_combo(convert.volume))
self._volume_btn.set_tooltip(_('Volume'))
self._volume_btn.props.icon_name = 'volume'
- self._volume_btn.props.group = self._lenght_btn
+ self._volume_btn.props.group = self._length_btn
self._area_btn = RadioToolButton()
self._area_btn.connect('clicked',
lambda w: self._update_combo(convert.area))
self._area_btn.set_tooltip(_('Area'))
self._area_btn.props.icon_name = 'area'
- self._area_btn.props.group = self._lenght_btn
+ self._area_btn.props.group = self._length_btn
self._weight_btn = RadioToolButton()
self._weight_btn.connect('clicked',
lambda w: self._update_combo(convert.weight))
self._weight_btn.set_tooltip(_('Weight'))
self._weight_btn.props.icon_name = 'weight'
- self._weight_btn.props.group = self._lenght_btn
+ self._weight_btn.props.group = self._length_btn
self._speed_btn = RadioToolButton()
self._speed_btn.connect('clicked',
lambda w: self._update_combo(convert.speed))
self._speed_btn.set_tooltip(_('Speed'))
self._speed_btn.props.icon_name = 'speed'
- self._speed_btn.props.group = self._lenght_btn
+ self._speed_btn.props.group = self._length_btn
self._time_btn = RadioToolButton()
self._time_btn.connect('clicked',
lambda w: self._update_combo(convert.time))
self._time_btn.set_tooltip(_('Time'))
self._time_btn.props.icon_name = 'time'
- self._time_btn.props.group = self._lenght_btn
+ self._time_btn.props.group = self._length_btn
self._temp_btn = RadioToolButton()
self._temp_btn.connect('clicked',
lambda w: self._update_combo(convert.temp))
self._temp_btn.set_tooltip(_('Temperature'))
self._temp_btn.props.icon_name = 'temp'
- self._temp_btn.props.group = self._lenght_btn
+ self._temp_btn.props.group = self._length_btn
- toolbarbox.toolbar.insert(self._lenght_btn, -1)
+ toolbarbox.toolbar.insert(self._length_btn, -1)
toolbarbox.toolbar.insert(self._volume_btn, -1)
toolbarbox.toolbar.insert(self._area_btn, -1)
toolbarbox.toolbar.insert(self._weight_btn, -1)
@@ -167,7 +167,7 @@ class ConvertActivity(activity.Activity):
toolbarbox.toolbar.insert(stopbtn, -1)
self.set_toolbar_box(toolbarbox)
- self._update_combo(convert.lenght)
+ self._update_combo(convert.length)
self.show_all()
def _update_label(self):
diff --git a/convert.py b/convert.py
index b9606fa..f33875f 100644
--- a/convert.py
+++ b/convert.py
@@ -16,12 +16,12 @@
from gettext import gettext as _
-lenght = {_('Meters (m)'): (1, 1),
+length = {_('Meters (m)'): (1, 1),
_('Kilometers (km)'): (1000, 0.001),
_('Centimeter (cm)'): (0.01, 100),
_('Cables'): (185.0, 0.00540540540541),
_('Miles'): (1609.344, 0.000621371192237),
- _('Milimeters (mm)'): (0.001, 1000),
+ _('Millimeters (mm)'): (0.001, 1000),
_('Decimeter (dm)'): (0.1, 10),
_('Decameter'): (10, 0.1),
_('Hectometers (hm)'): (100, 0.01),
@@ -29,7 +29,7 @@ lenght = {_('Meters (m)'): (1, 1),
_('Ell'): (1.14, 0.877192982456),
_('Ems (Pica)'): (0.00422, 236.966824645),
_('Fathoms'): (1.83, 0.546448087432),
- _('Foot'): (0.3048, 3.280839895013123),
+ _('feet'): (0.3048, 3.280839895013123),
_('Furlongs'): (201.0, 0.00497512437811),
_('Inches (in)'): (0.0254, 39.3700787402),
_('Micrometers'): (0.000001, 1000000.0),
@@ -38,34 +38,34 @@ lenght = {_('Meters (m)'): (1, 1),
}
area = {_('Meter'): (1, 1, 2),
- _('Foot'): (0.092903, 10.763915051182416, 2),
+ _('feet'): (0.092903, 10.763915051182416, 2),
_('Yard'): (0.836127, 1.1959905612424908, 2),
_('Inch'): (0.00064516, 1550.0031000062002, 2),
_('Kilometer'): (1000000, 0.000001, 2),
_('Mile'): (2589990, 3.8610187684122333e-7, 2),
_('Centimeter'): (0.0001, 10000, 2),
- _('milimeter'): (0.000001, 1000000, 2),
+ _('Millimeter'): (0.000001, 1000000, 2),
_('Micrometer'): (1e-12, 1000000000000, 2),
_('Acre'): (4046.86, 0.00024710516301527604)
}
weight = {_('Gram'): (1, 1),
_('Kilogram'): (1000, 0.001),
- _('Miligram'): (0.001, 1000.0000000000001),
+ _('Milligram'): (0.001, 1000.0000000000001),
_('Ton'): (1000000, 0.000001),
_('Pound'): (453.592, 0.0022046244201837776),
_('Ounce'): (28.3495, 0.03527399072294044),
- _('Carrat'): (0.2, 5)
+ _('Carat'): (0.2, 5)
}
volume = {_('Meter'): (1, 1, 3),
- _('Foot'): (0.0283168, 35.31472482766414, 3),
+ _('feet'): (0.0283168, 35.31472482766414, 3),
_('Yard'): (0.764555, 1.307950376362721, 3),
_('Inch'): (0.0000163871, 61023.61003472243, 3),
_('Kilometer'): (1000000000, 1e-9, 3),
_('Mile'): (4168180000, 2.399128636479231e-10, 3),
_('Centimeter'): (0.000001, 1000000, 3),
- _('Milimeter'): (1e-9, 999999999.9999999, 3),
+ _('Millimeter'): (1e-9, 999999999.9999999, 3),
_('Liter'): (0.001, 1000),
_('Milliliter'): (0.000001, 1000000, 3),
_('Pint'): (0.000473176, 2113.378531455526),
@@ -74,16 +74,16 @@ volume = {_('Meter'): (1, 1, 3),
}
speed = {_('Kilometers/Hour'): (1, 1),
- _('Centimeter/Minute'): (0.000679856115108, 1470.8994709),
- _('Centimeter/Second'): (0.0359712230216, 27.8),
- _('Foot/Hour'): (0.000304676258993, 3282.17237308),
+ _('Centimeters/Minute'): (0.000679856115108, 1470.8994709),
+ _('Centimeters/Second'): (0.0359712230216, 27.8),
+ _('feet/Hour'): (0.000304676258993, 3282.17237308),
_('Feet/Minute'): (0.018273381295, 54.7244094488),
_('Feet/Second'): (1.09712230216, 0.911475409836),
_('Inches/Second'): (0.0913669064748, 10.9448818898),
_('Kilometers/Second'): (3597.12230216, 0.000278),
_('Knots'): (1.84892086331, 0.540856031128),
_('Mach'): (1194.24460432, 0.00083734939759),
- _('Meter/Second'): (3.59712230216, 0.278),
+ _('Meters/Second'): (3.59712230216, 0.278),
}
time = {_('Day'): (1, 1),
diff --git a/icons/lenght.svg b/icons/length.svg
index b6240f9..b6240f9 100644
--- a/icons/lenght.svg
+++ b/icons/length.svg
diff --git a/icons/liquid.svg b/icons/liquid.svg
deleted file mode 100644
index 32584d2..0000000
--- a/icons/liquid.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- width="55"
- height="55"
- id="svg2"
- version="1.1"
- inkscape:version="0.48.2 r9819"
- sodipodi:docname="liquid.svg">
- <defs
- id="defs4" />
- <sodipodi:namedview
- id="base"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1.0"
- inkscape:pageopacity="0.0"
- inkscape:pageshadow="2"
- inkscape:zoom="10"
- inkscape:cx="17.484776"
- inkscape:cy="28.978219"
- inkscape:document-units="px"
- inkscape:current-layer="layer1"
- showgrid="false"
- inkscape:window-width="1200"
- inkscape:window-height="804"
- inkscape:window-x="0"
- inkscape:window-y="30"
- inkscape:window-maximized="1" />
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <g
- inkscape:label="Layer 1"
- inkscape:groupmode="layer"
- id="layer1"
- transform="translate(0,-997.36218)">
- <g
- id="g3056"
- transform="matrix(2.1137441,0,0,2.015444,-17.148815,-1043.3033)"
- style="stroke:#ffffff">
- <path
- sodipodi:nodetypes="cccc"
- inkscape:connector-curvature="0"
- id="path3052"
- d="m 10.6,1013.4622 4.4,24.7 10.5,0 5.2,-24.9"
- style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- <path
- sodipodi:nodetypes="czzzc"
- inkscape:connector-curvature="0"
- id="path3054"
- d="m 11.9,1020.2622 c 0.102419,-0.717 3.178054,-1.1297 4.5,0 1.321946,1.1297 3.05,0.7223 4.4,0 1.35,-0.7224 2.266667,-1.3672 3.7,0 1.433333,1.3672 4.9,0 4.9,0"
- style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
- </g>
- </g>
-</svg>