Use translated versions of the type names everywhere other than in the .sif(z) files.

[synfig.git] / synfig-core / trunk / src / synfig / valuenode_scale.cpp

diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.cpp b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
index ffe90d6..dbe3b85 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_scale.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_scale.cpp
@@ -34,7 +34,6 @@
 #include "valuenode_scale.h"
 #include "valuenode_const.h"
 #include <stdexcept>
-#include <cassert>
 #include "color.h"
 #include "vector.h"
 #include "time.h"
@@ -85,7 +84,7 @@ ValueNode_Scale::ValueNode_Scale(const ValueBase &value):
                break;
        default:
                assert(0);
-               throw runtime_error("synfig::ValueNode_Scale:Bad type "+ValueBase::type_name(value.get_type()));
+               throw runtime_error(_("synfig::ValueNode_Scale:Bad type ")+ValueBase::type_local_name(value.get_type()));
        }
 
        assert(value_node);
@@ -193,8 +192,7 @@ synfig::ValueNode_Scale::operator()(Time t)const
 bool
 ValueNode_Scale::set_link_vfunc(int i,ValueNode::Handle x)
 {
-       if(!(i==0 || i==1))
-               return false;
+       assert(i>=0 && i<link_count());
 
        if(i==0 && !set_value_node(x))
                return false;
@@ -210,7 +208,8 @@ ValueNode_Scale::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_Scale::get_link_vfunc(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0)
                return value_node;
        else if(i==1)
@@ -227,7 +226,8 @@ ValueNode_Scale::link_count()const
 String
 ValueNode_Scale::link_local_name(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0)
                return _("Link");
        else if(i==1)
@@ -238,7 +238,8 @@ ValueNode_Scale::link_local_name(int i)const
 String
 ValueNode_Scale::link_name(int i)const
 {
-       assert(i==0 || i==1);
+       assert(i>=0 && i<link_count());
+
        if(i==0)
                return "link";
        else if(i==1)