X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchange-iterator.cc;h=2a4f52751bbe97523210740d46104259658efc68;hb=b1e87575d7dbce73e74c7e6eb1b64dbfc82e65a4;hp=5a71519e5f62ac2413054d7bb2633ebcb2258f53;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc index 5a71519e5f..2a4f52751b 100644 --- a/lily/change-iterator.cc +++ b/lily/change-iterator.cc @@ -57,7 +57,7 @@ Change_iterator::process (Moment m) if (current && current->id_string () == to_id) { String msg; - msg += _ ("Can't switch translators, I'm there already"); + msg += _f ("can't change, already in translator: %s", to_id); } if (current) @@ -77,21 +77,20 @@ Change_iterator::process (Moment m) dest->add_context (last); } else - { - get_music ()->origin ()->warning ("could not find context to switch to."); - } + /* FIXME: constant error message. */ + get_music ()->origin ()->warning (_ ("can't find context to switch to")); } else { - /* - We could change the current translator's id, but that would make - errors hard to catch - - last->translator_id_string () = get_change ()->change_to_id_string (); - */ - error (_ ("I'm one myself")); + /* We could change the current translator's id, but that would make + errors hard to catch. + + last->translator_id_string () = get_change + ()->change_to_id_string (); */ + error (_f ("not changing to same context type: %s", to_type)); } else + /* FIXME: uncomprehensable message */ error (_ ("none of these in my family")); Simple_music_iterator::process (m);